From: David S. Miller Date: Fri, 16 Mar 2018 14:03:48 +0000 (-0400) Subject: Merge branch 'vlan-untag-and-insert-fixes' X-Git-Tag: v4.19~1406^2~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e693be293f16fe446c3a1b72f8bbc0a5101ca5ea;p=platform%2Fkernel%2Flinux-rpi3.git Merge branch 'vlan-untag-and-insert-fixes' Toshiaki Makita says: ==================== Fix vlan untag and insertion for bridge and vlan with reorder_hdr off As Brandon Carpenter reported[1], sending non-vlan-offloaded packets from bridge devices ends up with corrupted packets. He narrowed down this problem and found that the root cause is in skb_reorder_vlan_header(). While I was working on fixing this problem, I found that the function does not work properly for double tagged packets with reorder_hdr off as well. Patch 1 fixes these 2 problems in skb_reorder_vlan_header(). And it turned out that fixing skb_reorder_vlan_header() is not sufficient to receive double tagged packets with reorder_hdr off while I was testing the fix. Vlan tags got out of order when vlan devices with reorder_hdr disabled were stacked. Patch 2 fixes this problem. [1] https://www.spinics.net/lists/linux-ethernet-bridging/msg07039.html ==================== Signed-off-by: David S. Miller --- e693be293f16fe446c3a1b72f8bbc0a5101ca5ea