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

• Lines: 20
• Date: Thu Jun 29 19:18:50 1995
• Orig file: v1.3.5/linux/drivers/net/lance.c
• Orig date: Tue Jun 6 11:22:09 1995

diff -u --recursive --new-file v1.3.5/linux/drivers/net/lance.c linux/drivers/net/lance.c
@@ -984,7 +984,7 @@
 			short pkt_len = (lp->rx_ring[entry].msg_length & 0xfff)-4;
 			struct sk_buff *skb;
 
-			skb = alloc_skb(pkt_len, GFP_ATOMIC);
+			skb = dev_alloc_skb(pkt_len);
 			if (skb == NULL) {
 				printk("%s: Memory squeeze, deferring packet.\n", dev->name);
 				for (i=0; i < RX_RING_SIZE; i++)
@@ -998,9 +998,8 @@
 				}
 				break;
 			}
-			skb->len = pkt_len;
 			skb->dev = dev;
-			memcpy(skb->data,
+			memcpy(skb_put(skb,pkt_len),
 				   (unsigned char *)(lp->rx_ring[entry].base & 0x00ffffff),
 				   pkt_len);
 			skb->protocol=eth_type_trans(skb,dev);