projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dde655c
)
[VLAN]: Fix nested VLAN transmit bug
author
Joonwoo Park
<joonwpark81@gmail.com>
Thu, 29 Nov 2007 11:16:41 +0000
(22:16 +1100)
committer
Herbert Xu
<herbert@gondor.apana.org.au>
Thu, 29 Nov 2007 11:16:41 +0000
(22:16 +1100)
Fix misbehavior of vlan_dev_hard_start_xmit() for recursive encapsulations.
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
net/8021q/vlan_dev.c
patch
|
blob
|
history
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index
7a36878
..
4f99bb8
100644
(file)
--- a/
net/8021q/vlan_dev.c
+++ b/
net/8021q/vlan_dev.c
@@
-462,7
+462,8
@@
int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
* OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
*/
- if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
+ if (veth->h_vlan_proto != htons(ETH_P_8021Q) ||
+ VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR) {
int orig_headroom = skb_headroom(skb);
unsigned short veth_TCI;