projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: dsa: tag_ocelot: call only the relevant portion of __skb_vlan_pop() on TX
[linux-2.6-microblaze.git]
/
net
/
dsa
/
tag_ocelot.c
diff --git
a/net/dsa/tag_ocelot.c
b/net/dsa/tag_ocelot.c
index
73ee09d
..
20bf707
100644
(file)
--- a/
net/dsa/tag_ocelot.c
+++ b/
net/dsa/tag_ocelot.c
@@
-30,7
+30,7
@@
static void ocelot_xmit_get_vlan_info(struct sk_buff *skb, struct dsa_port *dp,
br_vlan_get_proto(br, &proto);
if (ntohs(hdr->h_vlan_proto) == proto) {
-
__skb_vlan_pop
(skb, &tci);
+
vlan_remove_tag
(skb, &tci);
*vlan_tci = tci;
} else {
rcu_read_lock();