diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-13 01:33:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-16 01:21:33 -0500 |
| commit | b93ab837a2d3eb394082c9eae4ee0a4f83060027 (patch) | |
| tree | 7189349bad6a0d145c6ba6a051e8eb79d07bc1ec | |
| parent | c5d5d1721763842a516529e553433d13b11c3f31 (diff) | |
vlan: Use __vlan_hwaccel_put_tag() in rx
Commit 05423b241311c9380 (vlan: allow null VLAN ID to be used)
forgot to update __vlan_hwaccel_rx() & vlan_gro_common()
We need to set VLAN_TAG_PRESENT flag in skb->vlan_tci
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/8021q/vlan_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 8d5ca2ac4f8d..971d3755ae87 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
| @@ -14,7 +14,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |||
| 14 | if (skb_bond_should_drop(skb)) | 14 | if (skb_bond_should_drop(skb)) |
| 15 | goto drop; | 15 | goto drop; |
| 16 | 16 | ||
| 17 | skb->vlan_tci = vlan_tci; | 17 | __vlan_hwaccel_put_tag(skb, vlan_tci); |
| 18 | skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); | 18 | skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); |
| 19 | 19 | ||
| 20 | if (!skb->dev) | 20 | if (!skb->dev) |
| @@ -83,7 +83,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, | |||
| 83 | if (skb_bond_should_drop(skb)) | 83 | if (skb_bond_should_drop(skb)) |
| 84 | goto drop; | 84 | goto drop; |
| 85 | 85 | ||
| 86 | skb->vlan_tci = vlan_tci; | 86 | __vlan_hwaccel_put_tag(skb, vlan_tci); |
| 87 | skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); | 87 | skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); |
| 88 | 88 | ||
| 89 | if (!skb->dev) | 89 | if (!skb->dev) |