patch-1.3.6 linux/drivers/net/3c505.c

• Lines: 24
• Date: Thu Jun 29 19:18:49 1995
• Orig file: v1.3.5/linux/drivers/net/3c505.c
• Orig date: Thu Jun 29 19:02:41 1995

diff -u --recursive --new-file v1.3.5/linux/drivers/net/3c505.c linux/drivers/net/3c505.c
@@ -560,7 +560,7 @@
 
 	rlen = (len+1) & ~1;
 
-	skb = alloc_skb(rlen, GFP_ATOMIC);
+	skb = dev_alloc_skb(rlen);
 
 	/*
 	 * make sure the data register is going the right way
@@ -587,13 +587,12 @@
 		adapter->stats.rx_dropped++;
 
 	} else {
-		skb->len = rlen;
 		skb->dev = dev;
 
 		/*
 		 * now read the data from the adapter
 		 */
-		ptr = (unsigned short *)(skb->data);
+		ptr = (unsigned short *)skb_put(skb,len);
 		for (i = 0; i < (rlen/2); i++) { 
 			timeout = 0;
 			while ((inb_status(dev->base_addr)&HRDY) == 0 && timeout++ < 20000)