git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
8021q
/
vlan_dev.c
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index
da9cfe9
..
425912a
100644
(file)
--- a/
net/8021q/vlan_dev.c
+++ b/
net/8021q/vlan_dev.c
@@
-62,7
+62,7
@@
int vlan_dev_rebuild_header(struct sk_buff *skb)
default:
printk(VLAN_DBG
"%s: unable to resolve type %X addresses.\n",
default:
printk(VLAN_DBG
"%s: unable to resolve type %X addresses.\n",
- dev->name,
(int)veth->h_vlan_encapsulated_proto
);
+ dev->name,
ntohs(veth->h_vlan_encapsulated_proto)
);
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
break;
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
break;
@@
-380,6
+380,9
@@
int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
} else {
vhdr->h_vlan_encapsulated_proto = htons(len);
}
} else {
vhdr->h_vlan_encapsulated_proto = htons(len);
}
+
+ skb->protocol = htons(ETH_P_8021Q);
+ skb->nh.raw = skb->data;
}
/* Before delegating work to the lower layer, enter our MAC-address */
}
/* Before delegating work to the lower layer, enter our MAC-address */