diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-09 18:26:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-09 18:26:03 +0000 |
| commit | 7486cf730ac50b1577276f70a470d19115bec32f (patch) | |
| tree | bb9d76ba9f8ec4365acdbdb30b2436645380581f /target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch | |
| parent | 63c08f0f0b41e1ab3f453ab811a8b51ae54542c6 (diff) | |
| download | master-31e0f0ae-7486cf730ac50b1577276f70a470d19115bec32f.tar.gz master-31e0f0ae-7486cf730ac50b1577276f70a470d19115bec32f.tar.bz2 master-31e0f0ae-7486cf730ac50b1577276f70a470d19115bec32f.zip | |
atheros: merge a few patches into the right place
SVN-Revision: 26556
Diffstat (limited to 'target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch')
| -rw-r--r-- | target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch index bb4af76a61..e59005944a 100644 --- a/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch +++ b/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ar231x.c +++ b/drivers/net/ar231x.c -@@ -740,6 +740,7 @@ static void ar231x_load_rx_ring(struct n +@@ -755,6 +755,7 @@ static void ar231x_load_rx_ring(struct n for (i = 0; i < nr_bufs; i++) { struct sk_buff *skb; ar231x_descr_t *rd; @@ -8,7 +8,7 @@ if (sp->rx_skb[idx]) break; -@@ -755,7 +756,9 @@ static void ar231x_load_rx_ring(struct n +@@ -770,7 +771,9 @@ static void ar231x_load_rx_ring(struct n * Make sure IP header starts on a fresh cache line. */ skb->dev = dev; @@ -19,7 +19,7 @@ sp->rx_skb[idx] = skb; rd = (ar231x_descr_t *) & sp->rx_ring[idx]; -@@ -829,20 +832,23 @@ static int ar231x_rx_int(struct net_devi +@@ -844,20 +847,23 @@ static int ar231x_rx_int(struct net_devi /* alloc new buffer. */ skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET); if (skb_new != NULL) { @@ -48,7 +48,7 @@ /* reset descriptor's curr_addr */ rxdesc->addr = virt_to_phys(skb_new->data); -@@ -1254,6 +1260,8 @@ static int ar231x_mdiobus_probe (struct +@@ -1269,6 +1275,8 @@ static int ar231x_mdiobus_probe (struct return PTR_ERR(phydev); } |