[kernel] generic-2.6/2.6.30: gets rid of the length limitation on the name in the...

[openwrt.git] / target / linux / atheros / patches-2.6.28 / 200-ar2313_enable_mvswitch.patch

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 710314d..a067f9d 100644 (file)
--- 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
+@@ -736,6 +736,7 @@ static void ar231x_load_rx_ring(struct n

        for (i = 0; i < nr_bufs; i++) {
                struct sk_buff *skb;
        for (i = 0; i < nr_bufs; i++) {
                struct sk_buff *skb;

-               ar2313_descr_t *rd;
+               ar231x_descr_t *rd;

 +              int offset = RX_OFFSET;
  
 +              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;
+@@ -751,7 +752,9 @@ static void ar231x_load_rx_ring(struct n

                 * Make sure IP header starts on a fresh cache line.
                 */
                skb->dev = dev;
                 * Make sure IP header starts on a fresh cache line.
                 */
                skb->dev = dev;


@@ -18,37 +18,37 @@
 +              skb_reserve(skb, offset);
                sp->rx_skb[idx] = skb;
  
 +              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];
+@@ -825,20 +828,23 @@ static int ar231x_rx_int(struct net_devi

                        /* alloc new buffer. */
                        /* alloc new buffer. */

-                       skb_new = dev_alloc_skb(AR2313_BUFSIZE + RX_OFFSET + 128);
+                       skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET);

                        if (skb_new != NULL) {
 +                              int offset;
  
                                skb = sp->rx_skb[idx];
                                /* set skb */
                        if (skb_new != NULL) {
 +                              int offset;
  
                                skb = sp->rx_skb[idx];
                                /* set skb */

-@@ -960,13 +964,17 @@ static int ar2313_rx_int(struct net_devi
+                               skb_put(skb,

                                                ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
                                                ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);

- 
+-

                                dev->stats.rx_bytes += skb->len;
 -                              skb->protocol = eth_type_trans(skb, dev);
                                dev->stats.rx_bytes += skb->len;
 -                              skb->protocol = eth_type_trans(skb, dev);

-+
-                               /* pass the packet to upper layers */
+-                              /* pass the packet to upper layers */

 -                              netif_rx(skb);
 -                              netif_rx(skb);

-+                              sp->rx(skb);

  
  

++                              /* pass the packet to upper layers */
++                              sp->rx(skb);

                                skb_new->dev = dev;
 +
                                /* 16 bit align */
                                skb_new->dev = dev;
 +
                                /* 16 bit align */

--                              skb_reserve(skb_new, RX_OFFSET + 32);
-+                              offset = RX_OFFSET + 32;
+-                              skb_reserve(skb_new, RX_OFFSET);
++                              offset = RX_OFFSET;

 +                              if (sp->phy_dev)
 +                                      offset += sp->phy_dev->pkt_align;
 +                              skb_reserve(skb_new, offset);
                                /* reset descriptor's curr_addr */
                                rxdesc->addr = virt_to_phys(skb_new->data);
  
 +                              if (sp->phy_dev)
 +                                      offset += sp->phy_dev->pkt_align;
 +                              skb_reserve(skb_new, offset);
                                /* reset descriptor's curr_addr */
                                rxdesc->addr = virt_to_phys(skb_new->data);
  

-@@ -1392,6 +1400,8 @@ static int ar2313_mdiobus_probe (struct 
+@@ -1240,6 +1246,8 @@ static int ar231x_mdiobus_probe (struct 

                return PTR_ERR(phydev);
        }
  
                return PTR_ERR(phydev);
        }
  


@@ -57,11 +57,11 @@
        /* mask with MAC supported features */
        phydev->supported &= (SUPPORTED_10baseT_Half
                | SUPPORTED_10baseT_Full
        /* 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);
 +
        struct net_device *dev;
 +      int (*rx)(struct sk_buff *skb);
 +