summaryrefslogtreecommitdiffstats
path: root/net/ethernet
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-10-07 13:46:07 +0000
committerDavid S. Miller <davem@davemloft.net>2008-10-08 17:24:16 -0700
commit396138f03f4521c55ecc3a5dd75d4c56e6323244 (patch)
tree61dc43e540c861a4b05753da56a9fe2a19bea206 /net/ethernet
parent2e5f032095ff101274dfb03d5fd5e06d9aeb83cd (diff)
downloadlinux-396138f03f4521c55ecc3a5dd75d4c56e6323244.tar.gz
linux-396138f03f4521c55ecc3a5dd75d4c56e6323244.tar.bz2
linux-396138f03f4521c55ecc3a5dd75d4c56e6323244.zip
dsa: add support for Trailer tagging format
This adds support for the Trailer switch tagging format. This is another tagging that doesn't explicitly mark tagged packets with a distinct ethertype, so that we need to add a similar hack in the receive path as for the Original DSA tagging format. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Tested-by: Byron Bradley <byron.bbradley@gmail.com> Tested-by: Tim Ellis <tim.ellis@mac.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet')
-rw-r--r--net/ethernet/eth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index dae47e7a44d8..b9d85af2dd31 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -193,6 +193,8 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
*/
if (netdev_uses_dsa_tags(dev))
return htons(ETH_P_DSA);
+ if (netdev_uses_trailer_tags(dev))
+ return htons(ETH_P_TRAILER);
if (ntohs(eth->h_proto) >= 1536)
return eth->h_proto;