From 813227d9924b75d393a7a372ee09d0543d12f2c2 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 4 Dec 2015 09:45:07 +0000 Subject: kernel: mvswitch: merge 3.10+ compile fix into the code The lowest we support is 3.18, so no need to keep it as a separate patch. Signed-off-by: Jonas Gorski SVN-Revision: 47749 --- target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/files/drivers/net') diff --git a/target/linux/generic/files/drivers/net/phy/mvswitch.c b/target/linux/generic/files/drivers/net/phy/mvswitch.c index af73ec22a0..0ab447e8b2 100644 --- a/target/linux/generic/files/drivers/net/phy/mvswitch.c +++ b/target/linux/generic/files/drivers/net/phy/mvswitch.c @@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *dev, struct sk_buff *skb) if (vlan == -1) return; - __vlan_hwaccel_put_tag(skb, vlan); + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan); } @@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *pdev) #ifdef HEADER_MODE dev->priv_flags |= IFF_NO_IP_ALIGN; - dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; + dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX; #else - dev->features |= NETIF_F_HW_VLAN_RX; + dev->features |= NETIF_F_HW_VLAN_CTAG_RX; #endif return 0; -- cgit v1.2.3