From 1b945a38d38f06c54c7b54173506acd6fcf6cbf4 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47749 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../731-phy_mvswitch_3.10_compilation.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch (limited to 'target/linux/generic/patches-4.1') diff --git a/target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch b/target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch deleted file mode 100644 index 2053bd2f8e..0000000000 --- a/target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sat, 21 Sep 2013 13:56:51 +0200 -Subject: [PATCH] phy: mvswitch: fix 3.10 compilation - -Update to API changes in 3.10. - -Signed-off-by: Jonas Gorsi ---- - target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/net/phy/mvswitch.c -+++ b/drivers/net/phy/mvswitch.c -@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de - 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 * - - #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