Changeset 10868

Timestamp:

11/11/08 18:22:28 (5 years ago)

Author:

BrainSlayer

Message:

fix marvell switch performance problem (affects fonera 2200 and dir 400) thx nbd

Location:

src/linux/ar531x/linux-2.6.23/drivers/net

Files:

• ar2313/ar2313.c (modified) (4 diffs)
• phy/mvswitch.c (modified) (1 diff)

src/linux/ar531x/linux-2.6.23/drivers/net/ar2313/ar2313.c

@@ -841 +841 @@
                 struct sk_buff *skb;
                 ar2313_descr_t *rd;
+                int offset = RX_OFFSET;
 
                 if (sp->rx_skb[idx]) {
@@ -862 +863 @@
                  */
                 skb->dev = dev;
-                skb_reserve(skb, RX_OFFSET);
+                if (sp->phy_dev)
+                        offset += sp->phy_dev->pkt_align;
+                skb_reserve(skb, offset);
                 sp->rx_skb[idx] = skb;
 
@@ -953 +956 @@
                         skb_new = dev_alloc_skb(AR2313_BUFSIZE + RX_OFFSET + 128);
                         if (skb_new != NULL) {
+                                int offset;
 
                                 skb = sp->rx_skb[idx];
@@ -966 +970 @@
                                 skb_new->dev = dev;
                                 /* 16 bit align */
-                                skb_reserve(skb_new, RX_OFFSET + 32);
+                                offset = RX_OFFSET + 32;
+                                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);

src/linux/ar531x/linux-2.6.23/drivers/net/phy/mvswitch.c

@@ -339 +339 @@
 
         /* hook into the tx function */
+        pdev->pkt_align = 2;
         priv->hardstart = dev->hard_start_xmit;
         pdev->netif_receive_skb = mvswitch_netif_receive_skb;