git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: deliver skbs on inactive slaves to exact matches
[pandora-kernel.git]
/
net
/
8021q
/
vlan_core.c
diff --git
a/net/8021q/vlan_core.c
b/net/8021q/vlan_core.c
index
c584a0a
..
50f58f5
100644
(file)
--- a/
net/8021q/vlan_core.c
+++ b/
net/8021q/vlan_core.c
@@
-12,7
+12,7
@@
int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
return NET_RX_DROP;
if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
return NET_RX_DROP;
if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-
goto drop
;
+
skb->deliver_no_wcard = 1
;
skb->skb_iif = skb->dev->ifindex;
__vlan_hwaccel_put_tag(skb, vlan_tci);
skb->skb_iif = skb->dev->ifindex;
__vlan_hwaccel_put_tag(skb, vlan_tci);
@@
-61,7
+61,7
@@
int vlan_hwaccel_do_receive(struct sk_buff *skb)
dev->dev_addr))
skb->pkt_type = PACKET_HOST;
break;
dev->dev_addr))
skb->pkt_type = PACKET_HOST;
break;
- }
;
+ }
return 0;
}
return 0;
}
@@
-84,7
+84,7
@@
vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
struct sk_buff *p;
if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
struct sk_buff *p;
if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-
goto drop
;
+
skb->deliver_no_wcard = 1
;
skb->skb_iif = skb->dev->ifindex;
__vlan_hwaccel_put_tag(skb, vlan_tci);
skb->skb_iif = skb->dev->ifindex;
__vlan_hwaccel_put_tag(skb, vlan_tci);