Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux-2.6-block.git] / net / ethernet / eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index d850fdc828f932c20191741a75bf90acffb9f55f..9e63f252a89ead08fda157e716607938452c0b49 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -127,7 +127,7 @@ u32 eth_get_headlen(void *data, unsigned int len)
        struct flow_keys keys;
 
        /* this should never happen, but better safe than sorry */
-       if (len < sizeof(*eth))
+       if (unlikely(len < sizeof(*eth)))
                return len;
 
        /* parse any remaining L2/L3 headers, check for L4 */