mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
e80f40cbe4
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: d461933638 ("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>
67 lines
1.2 KiB
C
67 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
* Copyright (c) 2019, Vladimir Oltean <olteanv@gmail.com>
|
|
*/
|
|
|
|
#ifndef _NET_DSA_8021Q_H
|
|
#define _NET_DSA_8021Q_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct dsa_switch;
|
|
struct sk_buff;
|
|
struct net_device;
|
|
struct packet_type;
|
|
|
|
#if IS_ENABLED(CONFIG_NET_DSA_TAG_8021Q)
|
|
|
|
int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int index,
|
|
bool enabled);
|
|
|
|
struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,
|
|
u16 tpid, u16 tci);
|
|
|
|
u16 dsa_8021q_tx_vid(struct dsa_switch *ds, int port);
|
|
|
|
u16 dsa_8021q_rx_vid(struct dsa_switch *ds, int port);
|
|
|
|
int dsa_8021q_rx_switch_id(u16 vid);
|
|
|
|
int dsa_8021q_rx_source_port(u16 vid);
|
|
|
|
#else
|
|
|
|
int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int index,
|
|
bool enabled)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,
|
|
u16 tpid, u16 tci)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
u16 dsa_8021q_tx_vid(struct dsa_switch *ds, int port)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
u16 dsa_8021q_rx_vid(struct dsa_switch *ds, int port)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int dsa_8021q_rx_switch_id(u16 vid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int dsa_8021q_rx_source_port(u16 vid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif /* IS_ENABLED(CONFIG_NET_DSA_TAG_8021Q) */
|
|
|
|
#endif /* _NET_DSA_8021Q_H */
|