aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.23
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-04-29 12:55:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-04-29 12:55:44 +0000
commit653cf2c07823504a601aacf9fe310c3766995880 (patch)
tree4aa16292d4923739e4d17a4c4dd292dc92ec8571 /target/linux/atheros/patches-2.6.23
parent8f54e06573d9d3693ca9bf5efebfe42c5362d02b (diff)
downloadupstream-653cf2c07823504a601aacf9fe310c3766995880.tar.gz
upstream-653cf2c07823504a601aacf9fe310c3766995880.tar.bz2
upstream-653cf2c07823504a601aacf9fe310c3766995880.zip
enable a different pseudo-vlan mode in the marvell switch (uses a proprietary header instead of a proprietary trailer) - fixes some mtu issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10975 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.23')
-rw-r--r--target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch31
1 files changed, 20 insertions, 11 deletions
diff --git a/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
index b209aee0c8..09c17977df 100644
--- a/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
+++ b/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
@@ -1,32 +1,41 @@
Index: linux-2.6.23.16/drivers/net/ar2313/ar2313.c
===================================================================
---- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.c 2008-04-20 10:26:15.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/ar2313/ar2313.c 2008-04-20 10:26:16.000000000 +0200
-@@ -955,7 +955,7 @@
+--- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.c 2008-04-29 14:51:39.000000000 +0200
++++ linux-2.6.23.16/drivers/net/ar2313/ar2313.c 2008-04-29 14:52:14.000000000 +0200
+@@ -219,7 +219,7 @@
+ dev->do_ioctl = &ar2313_ioctl;
+
+ // SAMEER: do we need this?
+- dev->features |= NETIF_F_SG | NETIF_F_HIGHDMA;
++ dev->features |= NETIF_F_HIGHDMA | NETIF_F_HW_CSUM;
+
+ tasklet_init(&sp->rx_tasklet, rx_tasklet_func, (unsigned long) dev);
+ tasklet_disable(&sp->rx_tasklet);
+@@ -953,9 +953,9 @@
+ ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
+
dev->stats.rx_bytes += skb->len;
- skb->protocol = eth_type_trans(skb, dev);
+- skb->protocol = eth_type_trans(skb, dev);
++
/* pass the packet to upper layers */
- netif_rx(skb);
+ sp->rx(skb);
skb_new->dev = dev;
/* 16 bit align */
-@@ -1370,6 +1370,11 @@
+@@ -1370,6 +1370,8 @@
return PTR_ERR(phydev);
}
-+ if (phydev->netif_rx)
-+ sp->rx = phydev->netif_rx;
-+ else
-+ sp->rx = netif_rx;
++ sp->rx = phydev->netif_rx;
+
/* mask with MAC supported features */
phydev->supported &= (SUPPORTED_10baseT_Half
| SUPPORTED_10baseT_Full
Index: linux-2.6.23.16/drivers/net/ar2313/ar2313.h
===================================================================
---- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.h 2008-04-20 10:26:15.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/ar2313/ar2313.h 2008-04-20 10:26:16.000000000 +0200
+--- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.h 2008-04-29 14:51:39.000000000 +0200
++++ linux-2.6.23.16/drivers/net/ar2313/ar2313.h 2008-04-29 14:52:15.000000000 +0200
@@ -107,6 +107,8 @@
*/
struct ar2313_private {