diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-22 14:46:58 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-22 14:46:58 +0000 |
| commit | a5c4f544067e9cf7a79342bd20547beb41d80fba (patch) | |
| tree | 0c06af302c9c26ed1899ffb67994222548e18269 /target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch | |
| parent | b150231d5827a823879fd596b2dee421e703f841 (diff) | |
atheros: clean up the 2.6.28 port in preparation for pushing it upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14967 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch')
| -rw-r--r-- | target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch index 710314d7f7..88ffad62d0 100644 --- a/target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch +++ b/target/linux/atheros/patches-2.6.28/200-ar2313_enable_mvswitch.patch @@ -1,14 +1,14 @@ ---- a/drivers/net/ar2313/ar2313.c -+++ b/drivers/net/ar2313/ar2313.c -@@ -841,6 +841,7 @@ static void ar2313_load_rx_ring(struct n +--- a/drivers/net/ar231x.c ++++ b/drivers/net/ar231x.c +@@ -735,6 +735,7 @@ static void ar231x_load_rx_ring(struct n for (i = 0; i < nr_bufs; i++) { struct sk_buff *skb; - ar2313_descr_t *rd; + ar231x_descr_t *rd; + int offset = RX_OFFSET; - if (sp->rx_skb[idx]) { - #if DEBUG_RX -@@ -862,7 +863,9 @@ static void ar2313_load_rx_ring(struct n + if (sp->rx_skb[idx]) + break; +@@ -753,7 +754,9 @@ static void ar231x_load_rx_ring(struct n * Make sure IP header starts on a fresh cache line. */ skb->dev = dev; @@ -18,8 +18,8 @@ + skb_reserve(skb, offset); sp->rx_skb[idx] = skb; - rd = (ar2313_descr_t *) & sp->rx_ring[idx]; -@@ -953,6 +956,7 @@ static int ar2313_rx_int(struct net_devi + rd = (ar231x_descr_t *) & sp->rx_ring[idx]; +@@ -828,6 +831,7 @@ static int ar231x_rx_int(struct net_devi /* alloc new buffer. */ skb_new = dev_alloc_skb(AR2313_BUFSIZE + RX_OFFSET + 128); if (skb_new != NULL) { @@ -27,7 +27,7 @@ skb = sp->rx_skb[idx]; /* set skb */ -@@ -960,13 +964,17 @@ static int ar2313_rx_int(struct net_devi +@@ -835,13 +839,17 @@ static int ar231x_rx_int(struct net_devi ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN); dev->stats.rx_bytes += skb->len; @@ -48,7 +48,7 @@ /* reset descriptor's curr_addr */ rxdesc->addr = virt_to_phys(skb_new->data); -@@ -1392,6 +1400,8 @@ static int ar2313_mdiobus_probe (struct +@@ -1243,6 +1251,8 @@ static int ar231x_mdiobus_probe (struct return PTR_ERR(phydev); } @@ -57,11 +57,11 @@ /* mask with MAC supported features */ phydev->supported &= (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full ---- a/drivers/net/ar2313/ar2313.h -+++ b/drivers/net/ar2313/ar2313.h -@@ -107,6 +107,8 @@ typedef struct { +--- a/drivers/net/ar231x.h ++++ b/drivers/net/ar231x.h +@@ -221,6 +221,8 @@ typedef struct { */ - struct ar2313_private { + struct ar231x_private { struct net_device *dev; + int (*rx)(struct sk_buff *skb); + |