Revision 99b192da9c99284ad3374132e56f66995cadc6b4 authored by Toshiaki Makita on 27 March 2014, 12:46:56 UTC, committed by David S. Miller on 28 March 2014, 20:33:09 UTC
If a bridge with vlan_filtering enabled receives frames with stacked
vlan tags, i.e., they have two vlan tags, br_vlan_untag() strips not
only the outer tag but also the inner tag.

br_vlan_untag() is called only from br_handle_vlan(), and in this case,
it is enough to set skb->vlan_tci to 0 here, because vlan_tci has already
been set before calling br_handle_vlan().

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 12464bb
History
File Mode Size
Kconfig -rw-r--r-- 3.1 KB
Makefile -rw-r--r-- 587 bytes
associola.c -rw-r--r-- 45.3 KB
auth.c -rw-r--r-- 23.8 KB
bind_addr.c -rw-r--r-- 13.7 KB
chunk.c -rw-r--r-- 9.5 KB
command.c -rw-r--r-- 2.0 KB
debug.c -rw-r--r-- 4.2 KB
endpointola.c -rw-r--r-- 13.0 KB
input.c -rw-r--r-- 30.7 KB
inqueue.c -rw-r--r-- 6.6 KB
ipv6.c -rw-r--r-- 28.3 KB
objcnt.c -rw-r--r-- 4.0 KB
output.c -rw-r--r-- 22.2 KB
outqueue.c -rw-r--r-- 52.0 KB
primitive.c -rw-r--r-- 7.3 KB
probe.c -rw-r--r-- 5.9 KB
proc.c -rw-r--r-- 14.3 KB
protocol.c -rw-r--r-- 41.4 KB
sm_make_chunk.c -rw-r--r-- 101.4 KB
sm_sideeffect.c -rw-r--r-- 48.9 KB
sm_statefuns.c -rw-r--r-- 196.9 KB
sm_statetable.c -rw-r--r-- 31.2 KB
socket.c -rw-r--r-- 200.4 KB
ssnmap.c -rw-r--r-- 3.1 KB
sysctl.c -rw-r--r-- 10.8 KB
transport.c -rw-r--r-- 19.7 KB
tsnmap.c -rw-r--r-- 9.5 KB
ulpevent.c -rw-r--r-- 30.4 KB
ulpqueue.c -rw-r--r-- 28.9 KB

back to top