Ignore:
Timestamp:
2011-04-09T20:26:03+02:00 (5 years ago)
Author:
nbd
Message:

atheros: merge a few patches into the right place

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-2.6.37/200-ar2313_enable_mvswitch.patch

    r25914 r26556  
    11--- a/drivers/net/ar231x.c 
    22+++ b/drivers/net/ar231x.c 
    3 @@ -740,6 +740,7 @@ static void ar231x_load_rx_ring(struct n 
     3@@ -755,6 +755,7 @@ static void ar231x_load_rx_ring(struct n 
    44        for (i = 0; i < nr_bufs; i++) { 
    55                struct sk_buff *skb; 
     
    99                if (sp->rx_skb[idx]) 
    1010                        break; 
    11 @@ -755,7 +756,9 @@ static void ar231x_load_rx_ring(struct n 
     11@@ -770,7 +771,9 @@ static void ar231x_load_rx_ring(struct n 
    1212                 * Make sure IP header starts on a fresh cache line. 
    1313                 */ 
     
    2020  
    2121                rd = (ar231x_descr_t *) & sp->rx_ring[idx]; 
    22 @@ -829,20 +832,23 @@ static int ar231x_rx_int(struct net_devi 
     22@@ -844,20 +847,23 @@ static int ar231x_rx_int(struct net_devi 
    2323                        /* alloc new buffer. */ 
    2424                        skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET); 
     
    4949                                rxdesc->addr = virt_to_phys(skb_new->data); 
    5050  
    51 @@ -1254,6 +1260,8 @@ static int ar231x_mdiobus_probe (struct  
     51@@ -1269,6 +1275,8 @@ static int ar231x_mdiobus_probe (struct  
    5252                return PTR_ERR(phydev); 
    5353        } 
Note: See TracChangeset for help on using the changeset viewer.