diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /drivers/net/bonding/bond_main.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b1025b85acf1..163e0b06eaa5 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -2733,6 +2733,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack | |||
| 2733 | if (!slave || !slave_do_arp_validate(bond, slave)) | 2733 | if (!slave || !slave_do_arp_validate(bond, slave)) |
| 2734 | goto out_unlock; | 2734 | goto out_unlock; |
| 2735 | 2735 | ||
| 2736 | skb = skb_share_check(skb, GFP_ATOMIC); | ||
| 2737 | if (!skb) | ||
| 2738 | goto out_unlock; | ||
| 2739 | |||
| 2736 | if (!pskb_may_pull(skb, arp_hdr_len(dev))) | 2740 | if (!pskb_may_pull(skb, arp_hdr_len(dev))) |
| 2737 | goto out_unlock; | 2741 | goto out_unlock; |
| 2738 | 2742 | ||