From: David S. Miller Date: Tue, 17 Nov 2015 19:38:36 +0000 (-0500) Subject: Merge branch 'vlan-reorder' X-Git-Tag: firefly_0821_release~176^2~674^2~13 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=eb3f8b42aaba19325eff7e99842ca36429a0a3b8;p=firefly-linux-kernel-4.4.55.git Merge branch 'vlan-reorder' Vladislav Yasevich says: ==================== Fix issues with vlans without REORDER_HEADER A while ago Phil Sutter brought up an issue with vlans without REORDER_HEADER and bridges. The problem was that if a vlan without REORDER_HEADER was a port in the bridge, the bridge ended up forwarding corrupted packets that still contained the vlan header. The same issue exists for bridge mode macvlan/macvtap devices. An additional issue with vlans without REORDER_HEADER is that stacking them also doesn't work. The reason here is that skb_reorder_vlan_header() function assumes that it on ETH_HLEN bytes deep into the packet. That is not the case, when you a vlan without REORRDER_HEADER flag set. This series attempts to correct these 2 issues. 1) To solve the stacked vlans problem, the patch simply use skb->mac_len as an offset to start copying mac addresses that is part of header reordering. 2) To fix the issue with bridge/macvlan/macvtap, the second patch simply doesn't write the vlan header back to the packet if the vlan device is either a bridge or a macvlan port. This ends up being the simplest and least performance intrussive solution. I've considered extending patch 2 to all stacked devices (essentially checked for the presense of rx_handler), but that feels like a broader restriction and _may_ break existing uses. ==================== Signed-off-by: David S. Miller --- eb3f8b42aaba19325eff7e99842ca36429a0a3b8