diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
| commit | 58b8a5b45a097b477c037bc376e65dc5f214bf3d (patch) | |
| tree | 9fa2538a113fbd3aaa322d9c972aca3ca16b7e30 /drivers/net/bonding/bond_alb.c | |
| parent | ffeb414a59291d5891f09727beb793c109f19f08 (diff) | |
| parent | 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index f4e638c65129..5c6fba802f2b 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -326,6 +326,10 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct goto out; } + skb = skb_share_check(skb, GFP_ATOMIC); + if (!skb) + goto out; + if (!pskb_may_pull(skb, arp_hdr_len(bond_dev))) goto out; |