aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-12-04 09:45:07 +0000
committerJonas Gorski <jogo@openwrt.org>2015-12-04 09:45:07 +0000
commit813227d9924b75d393a7a372ee09d0543d12f2c2 (patch)
tree942db62c35071f7d6a1dead388fe1e7e8b860ea8 /target/linux/generic/patches-3.18
parent304c3411baac0f77b38f97360072c36a5ac8479b (diff)
downloadupstream-813227d9924b75d393a7a372ee09d0543d12f2c2.tar.gz
upstream-813227d9924b75d393a7a372ee09d0543d12f2c2.tar.bz2
upstream-813227d9924b75d393a7a372ee09d0543d12f2c2.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> SVN-Revision: 47749
Diffstat (limited to 'target/linux/generic/patches-3.18')
-rw-r--r--target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch b/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch
deleted file mode 100644
index 2053bd2f8e..0000000000
--- a/target/linux/generic/patches-3.18/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 <jogo@openwrt.org>
-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 <jogo@openwrt.org>
----
- 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;