diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-07-26 19:55:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-26 22:35:22 +0100 |
| commit | edac6f6332d96aab59af5f27a195f55cd080f034 (patch) | |
| tree | ae345263f38ccab88dfe975bfce8d2f5939718a2 /net/ethernet/eth.c | |
| parent | b6ad86e6ad6c46e52cac218e62613c6c47cf7fa0 (diff) | |
| download | linux-edac6f6332d96aab59af5f27a195f55cd080f034.tar.gz linux-edac6f6332d96aab59af5f27a195f55cd080f034.tar.bz2 linux-edac6f6332d96aab59af5f27a195f55cd080f034.zip | |
Revert "net: dsa: Allow drivers to filter packets they can decode source port from"
This reverts commit cc1939e4b3aaf534fb2f3706820012036825731c.
Currently 2 classes of DSA drivers are able to send/receive packets
directly through the DSA master:
- drivers with DSA_TAG_PROTO_NONE
- sja1105
Now that sja1105 has gained the ability to perform traffic termination
even under the tricky case (VLAN-aware bridge), and that is much more
functional (we can perform VLAN-aware bridging with foreign interfaces),
there is no reason to keep this code in the receive path of the network
core. So delete it.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet/eth.c')
| -rw-r--r-- | net/ethernet/eth.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 9cce612e8976..171ba75b74c9 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -182,12 +182,8 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) * at all, so we check here whether one of those tagging * variants has been configured on the receiving interface, * and if so, set skb->protocol without looking at the packet. - * The DSA tagging protocol may be able to decode some but not all - * traffic (for example only for management). In that case give it the - * option to filter the packets from which it can decode source port - * information. */ - if (unlikely(netdev_uses_dsa(dev)) && dsa_can_decode(skb, dev)) + if (unlikely(netdev_uses_dsa(dev))) return htons(ETH_P_XDSA); if (likely(eth_proto_is_802_3(eth->h_proto))) |