aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-20 15:24:29 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-20 15:24:29 -0700
commite77c8e83dd587f2616d7ff20d23a897891e6e20d (patch)
treeba5d2ce6541119f329b2fd51181aaae8528b38f0 /net/8021q
parent641cb85e68945878d520d5fc3c2dc64aa1dda868 (diff)
parentaf98441397227a5a4f212cd48710eea72a14dbdb (diff)
downloadkernel_samsung_aries-e77c8e83dd587f2616d7ff20d23a897891e6e20d.zip
kernel_samsung_aries-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.gz
kernel_samsung_aries-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index c0316e0..c584a0a 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -11,7 +11,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
if (netpoll_rx(skb))
return NET_RX_DROP;
- if (skb_bond_should_drop(skb))
+ if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
goto drop;
skb->skb_iif = skb->dev->ifindex;
@@ -83,7 +83,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
{
struct sk_buff *p;
- if (skb_bond_should_drop(skb))
+ if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
goto drop;
skb->skb_iif = skb->dev->ifindex;