patch-1.3.6 linux/drivers/net/ni52.c

Next file: linux/drivers/net/ni65.c
Previous file: linux/drivers/net/net_init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.5/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -803,12 +803,11 @@
         {
           totlen &= RBD_MASK; /* length of this frame */
           rbd->status = 0;
-          skb = (struct sk_buff *) alloc_skb(totlen, GFP_ATOMIC);
+          skb = (struct sk_buff *) dev_alloc_skb(totlen);
           if(skb != NULL)
           {
-            skb->len = totlen;
             skb->dev = dev;
-            memcpy( (char *) skb->data,(char *) p->base+(unsigned long) rbd->buffer, totlen);
+            memcpy(skb_put(skb,totlen),(char *) p->base+(unsigned long) rbd->buffer, totlen);
             skb->protocol=eth_type_trans(skb,dev);
             netif_rx(skb);
             p->stats.rx_packets++;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this