aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_alb.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-10-01 02:54:17 -0400
committerRobert Richter <robert.richter@amd.com>2010-10-01 02:54:17 -0400
commitef70fcc0cd5d98f5e2df82c9e598b47f351d4f66 (patch)
treeb801ba4d7ebb1155df68d530df49444ffa6252cc /drivers/net/bonding/bond_alb.c
parent4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb (diff)
parent98d943b02f6f1b57787ff1aa6f34d019a407e3ee (diff)
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts: arch/arm/oprofile/common.c Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
-rw-r--r--drivers/net/bonding/bond_alb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index c746b331771d..26bb118c4533 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -362,6 +362,9 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
362 goto out; 362 goto out;
363 } 363 }
364 364
365 if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
366 goto out;
367
365 if (skb->len < sizeof(struct arp_pkt)) { 368 if (skb->len < sizeof(struct arp_pkt)) {
366 pr_debug("Packet is too small to be an ARP\n"); 369 pr_debug("Packet is too small to be an ARP\n");
367 goto out; 370 goto out;