[PATCH] skb_padto()-area fixes in 8390, wavelan

Ar Iau, 2006-06-22 am 21:29 +1000, ysgrifennodd Herbert Xu:
> Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >
> > The 8390 change (corrected version) also makes 8390.c faster so should
> > be applied anyway, and the orinoco one fixes some code that isn't even
> > needed and someone forgot to remove long ago. Otherwise the skb_padto
>
> Yeah I agree totally.  However, I haven't actually seen the fixed 8390
> version being posted yet or at least not to netdev :)

Ah the resounding clang of a subtle hint ;)

Signed-off-by: Alan Cox <alan@redhat.com>

- Return 8390.c to the old way of handling short packets (which is also
faster)

- Remove the skb_padto from orinoco. This got left in when the padding bad
write patch was added and is actually not needed. This is fixing a merge
error way back when.

- Wavelan can also use the stack based buffer trick if you want
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index f8702742008..86be96af9c8 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -275,12 +275,14 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
         int send_length = skb->len, output_page;
         unsigned long flags;
+        char buf[ETH_ZLEN];
+        char *data = skb->data;
 
         if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
+                memset(buf, 0, ETH_ZLEN);       /* more efficient than doing just the needed bits */
+                memcpy(buf, data, skb->len);
                 send_length = ETH_ZLEN;
+                data = buf;
         }
 
         /* Mask interrupts from the ethercard. 
@@ -347,7 +349,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
          * trigger the send later, upon receiving a Tx done interrupt.
          */
          
-        ei_block_output(dev, send_length, skb->data, output_page);
+        ei_block_output(dev, send_length, data, output_page);
                 
         if (! ei_local->txing) 
         {