diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-12-04 09:45:07 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-04 09:45:07 +0000 |
| commit | 1b945a38d38f06c54c7b54173506acd6fcf6cbf4 (patch) | |
| tree | 8016d4ba6495e151af37fcc9ba7ea67c1a40e126 /target/linux/generic/files/drivers/net/phy/mvswitch.c | |
| parent | 4d71d66b4f1c93cbebed3b7bda7bb536332a0518 (diff) | |
| download | master-187ad058-1b945a38d38f06c54c7b54173506acd6fcf6cbf4.tar.gz master-187ad058-1b945a38d38f06c54c7b54173506acd6fcf6cbf4.tar.bz2 master-187ad058-1b945a38d38f06c54c7b54173506acd6fcf6cbf4.zip | |
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 <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/drivers/net/phy/mvswitch.c')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |