aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-11-25 08:34:23 +0000
committerJohn Crispin <john@openwrt.org>2013-11-25 08:34:23 +0000
commit8ee2b91ddd89238dcfe7590402197e0ad440d764 (patch)
tree3bf6a0235c3e16f795c49116c5ceda3142c3029c /target/linux
parentd84238ad2644ceca746c9c7e83b7306a9da54a2a (diff)
downloadupstream-8ee2b91ddd89238dcfe7590402197e0ad440d764.tar.gz
upstream-8ee2b91ddd89238dcfe7590402197e0ad440d764.tar.bz2
upstream-8ee2b91ddd89238dcfe7590402197e0ad440d764.zip
ralink: fix up the mt7530 driver to work properly with gmac2
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 38905
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
index 2e63a2d16d..98323b3007 100644
--- a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
+++ b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
@@ -81,7 +81,7 @@ Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
Index: linux-3.10.18/arch/mips/ralink/rt305x.c
===================================================================
--- linux-3.10.18.orig/arch/mips/ralink/rt305x.c 2013-11-04 13:31:29.000000000 +0100
-+++ linux-3.10.18/arch/mips/ralink/rt305x.c 2013-11-21 17:11:58.144603749 +0100
++++ linux-3.10.18/arch/mips/ralink/rt305x.c 2013-11-21 19:39:11.280814230 +0100
@@ -221,6 +221,7 @@
}
@@ -3998,8 +3998,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.h
Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c 2013-11-21 17:05:57.264595147 +0100
-@@ -0,0 +1,150 @@
++++ linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c 2013-11-21 17:13:18.808605675 +0100
+@@ -0,0 +1,154 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4096,6 +4096,7 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
+ priv->rx_dma[idx].rxd2 = RX_DMA_PLEN0(len);
+}
+
++#ifdef CONFIG_INET_LRO
+static int
+mt7620_get_skb_header(struct sk_buff *skb, void **iphdr, void **tcph,
+ u64 *hdr_flags, void *_priv)
@@ -4120,6 +4121,7 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
+
+ return 0;
+}
++#endif
+
+static struct fe_soc_data mt7620_data = {
+ .mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
@@ -4141,7 +4143,9 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
+ .mdio_read = mt7620_mdio_read,
+ .mdio_write = mt7620_mdio_write,
+ .mdio_adjust_link = mt7620_mdio_link_adjust,
++#ifdef CONFIG_INET_LRO
+ .get_skb_header = mt7620_get_skb_header,
++#endif
+};
+
+const struct of_device_id of_fe_match[] = {
@@ -4392,7 +4396,7 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt3883.c
Index: linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c 2013-11-21 15:20:28.684444349 +0100
++++ linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c 2013-11-21 19:36:18.720810129 +0100
@@ -0,0 +1,467 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -4469,11 +4473,11 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c
+ {
+ .name = "llllw",
+ .pvids = { 1, 1, 1, 1, 2, 1 },
-+ .vlans = { 0, 0x4f, 0x50 },
++ .vlans = { 0, 0x6f, 0x50 },
+ }, {
+ .name = "wllll",
+ .pvids = { 2, 1, 1, 1, 1, 1 },
-+ .vlans = { 0, 0x5e, 0x41 },
++ .vlans = { 0, 0x7e, 0x41 },
+ },
+};
+