diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
| commit | 21a180cda012e1f93e362dd4a9b0bfd3d8c92940 (patch) | |
| tree | 0e0d10baa3fdcd8ffbc6881076ff1695808dad9d /net/8021q | |
| parent | c7d4426a98a5f6654cd0b4b33d9dab2e77192c18 (diff) | |
| parent | 51e97a12bef19b7e43199fc153cf9bd5f2140362 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 0eb486d342dc..b6d55a9304f2 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
| @@ -24,8 +24,11 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |||
| 24 | 24 | ||
| 25 | if (vlan_dev) | 25 | if (vlan_dev) |
| 26 | skb->dev = vlan_dev; | 26 | skb->dev = vlan_dev; |
| 27 | else if (vlan_id) | 27 | else if (vlan_id) { |
| 28 | goto drop; | 28 | if (!(skb->dev->flags & IFF_PROMISC)) |
| 29 | goto drop; | ||
| 30 | skb->pkt_type = PACKET_OTHERHOST; | ||
| 31 | } | ||
| 29 | 32 | ||
| 30 | return polling ? netif_receive_skb(skb) : netif_rx(skb); | 33 | return polling ? netif_receive_skb(skb) : netif_rx(skb); |
| 31 | 34 | ||
| @@ -101,8 +104,11 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, | |||
| 101 | 104 | ||
| 102 | if (vlan_dev) | 105 | if (vlan_dev) |
| 103 | skb->dev = vlan_dev; | 106 | skb->dev = vlan_dev; |
| 104 | else if (vlan_id) | 107 | else if (vlan_id) { |
| 105 | goto drop; | 108 | if (!(skb->dev->flags & IFF_PROMISC)) |
| 109 | goto drop; | ||
| 110 | skb->pkt_type = PACKET_OTHERHOST; | ||
| 111 | } | ||
| 106 | 112 | ||
| 107 | for (p = napi->gro_list; p; p = p->next) { | 113 | for (p = napi->gro_list; p; p = p->next) { |
| 108 | unsigned long diffs; | 114 | unsigned long diffs; |