]> git.baikalelectronics.ru Git - kernel.git/commit
net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop
authorVladimir Oltean <vladimir.oltean@nxp.com>
Tue, 24 Mar 2020 09:45:34 +0000 (11:45 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2020 23:19:01 +0000 (16:19 -0700)
commit468d54ac165dd606c98f597843ea199bf11aa7d5
tree5872b1405182b8c0df709455dda06a2c115c7b97
parentb08a26186b3c18ad7945c9fa07ae4f7889faa13b
net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop

Not only did this wheel did not need reinventing, but there is also
an issue with it: It doesn't remove the VLAN header in a way that
preserves the L2 payload checksum when that is being provided by the DSA
master hw.  It should recalculate checksum both for the push, before
removing the header, and for the pull afterwards. But the current
implementation is quite dizzying, with pulls followed immediately
afterwards by pushes, the memmove is done before the push, etc.  This
makes a DSA master with RX checksumming offload to print stack traces
with the infamous 'hw csum failure' message.

So remove the dsa_8021q_remove_header function and replace it with
something that actually works with inet checksumming.

Fixes: cc7fd162584d ("net: dsa: tag_8021q: Create helper function for removing VLAN header")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/dsa/8021q.h
net/dsa/tag_8021q.c
net/dsa/tag_sja1105.c