hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
owl
Jonas Gorski 2015-12-04 09:45:07 +00:00
parent 304c3411ba
commit 813227d992
5 changed files with 3 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/files/drivers/net/phy/mvswitch.c
View File

@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *dev, struct sk_buff *skb)
if (vlan == -1) if (vlan == -1)
return; 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 #ifdef HEADER_MODE
dev->priv_flags |= IFF_NO_IP_ALIGN; 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 #else
dev->features |= NETIF_F_HW_VLAN_RX; dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
#endif #endif
return 0; return 0;

35
target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch
View File

@ -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;

35
target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch
View File

@ -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;

35
target/linux/generic/patches-4.3/731-phy_mvswitch_3.10_compilation.patch
View File

@ -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;

35
target/linux/generic/patches-4.4/731-phy_mvswitch_3.10_compilation.patch
View File

@ -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;