https://github.com/torvalds/linux
Revision 12464bb8de021a01fa7ec9299c273c247df7f198 authored by Toshiaki Makita on 27 March 2014, 12:46:55 UTC, committed by David S. Miller on 28 March 2014, 20:33:09 UTC
Bridge vlan code (br_vlan_get_tag()) assumes that all frames have vlan_tci if they are tagged, but if vlan tx offload is manually disabled on bridge device and frames are sent from vlan device on the bridge device, the tags are embedded in skb->data and they break this assumption. Extract embedded vlan tags and move them to vlan_tci at ingress. 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 a39ee44
Tip revision: 12464bb8de021a01fa7ec9299c273c247df7f198 authored by Toshiaki Makita on 27 March 2014, 12:46:55 UTC
bridge: Fix inabillity to retrieve vlan tags when tx offload is disabled
bridge: Fix inabillity to retrieve vlan tags when tx offload is disabled
Tip revision: 12464bb
| File | Mode | Size |
|---|---|---|
| 3com | ||
| acenic | ||
| adaptec | ||
| advansys | ||
| av7110 | ||
| bnx2 | ||
| bnx2x | ||
| cis | ||
| cpia2 | ||
| cxgb3 | ||
| dsp56k | ||
| e100 | ||
| edgeport | ||
| emi26 | ||
| emi62 | ||
| ess | ||
| kaweth | ||
| keyspan | ||
| keyspan_pda | ||
| korg | ||
| matrox | ||
| myricom | ||
| ositech | ||
| qlogic | ||
| r128 | ||
| radeon | ||
| sb16 | ||
| sun | ||
| tehuti | ||
| tigon | ||
| ttusb-budget | ||
| vicam | ||
| yam | ||
| yamaha | ||
| .gitignore | -rw-r--r-- | 39 bytes |
| Makefile | -rw-r--r-- | 11.5 KB |
| README.AddingFirmware | -rw-r--r-- | 1.5 KB |
| WHENCE | -rw-r--r-- | 26.5 KB |
| atmsar11.HEX | -rw-r--r-- | 18.7 KB |
| ihex2fw.c | -rw-r--r-- | 6.6 KB |
| mts_cdma.fw.ihex | -rw-r--r-- | 37.2 KB |
| mts_edge.fw.ihex | -rw-r--r-- | 37.8 KB |
| mts_gsm.fw.ihex | -rw-r--r-- | 37.2 KB |
| ti_3410.fw.ihex | -rw-r--r-- | 37.0 KB |
| ti_5052.fw.ihex | -rw-r--r-- | 37.0 KB |
| whiteheat.HEX | -rw-r--r-- | 43.9 KB |
| whiteheat_loader.HEX | -rw-r--r-- | 11.8 KB |
| whiteheat_loader_debug.HEX | -rw-r--r-- | 17.2 KB |
Computing file changes ...
