aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
commitb6b06000ebe2ffd2ebca24417ea9b9080cb6d643 (patch)
tree678c75cb4f1655a0e42ccd1f12b2ec0dfebce14f /target/linux/atheros/patches-3.10
parentd8d0e2c5368aeeb5ec2ddf06cfad0c919a3af8f4 (diff)
downloadupstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.tar.gz
upstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.tar.bz2
upstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.zip
kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38506
Diffstat (limited to 'target/linux/atheros/patches-3.10')
-rw-r--r--target/linux/atheros/patches-3.10/230-3_10-updates.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/target/linux/atheros/patches-3.10/230-3_10-updates.patch b/target/linux/atheros/patches-3.10/230-3_10-updates.patch
index 8428128039..a83bdcda51 100644
--- a/target/linux/atheros/patches-3.10/230-3_10-updates.patch
+++ b/target/linux/atheros/patches-3.10/230-3_10-updates.patch
@@ -9,26 +9,3 @@
PHY_INTERFACE_MODE_MII);
if (IS_ERR(phydev)) {
---- 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;