[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, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index b327b640823b..5b69befdab74 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2903,6 +2903,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
 {
         net_local *lp = (net_local *) dev->priv;
         unsigned long flags;
+        char data[ETH_ZLEN];
 
 #ifdef DEBUG_TX_TRACE
         printk(KERN_DEBUG "%s: ->wavelan_packet_xmit(0x%X)\n", dev->name,
@@ -2937,15 +2938,16 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
          * able to detect collisions, therefore in theory we don't really
          * need to pad. Jean II */
         if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
+                memset(data, 0, ETH_ZLEN);
+                memcpy(data, skb->data, skb->len);
+                /* Write packet on the card */
+                if(wv_packet_write(dev, data, ETH_ZLEN))
+                        return 1;       /* We failed */
         }
-
-        /* Write packet on the card */
-        if(wv_packet_write(dev, skb->data, skb->len))
+        else if(wv_packet_write(dev, skb->data, skb->len))
                 return 1;       /* We failed */
 
+
         dev_kfree_skb(skb);
 
 #ifdef DEBUG_TX_TRACE