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

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

diff -u --recursive --new-file v1.3.5/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -1561,17 +1561,16 @@
 
 			sksize = pkt_len;
 
-			if ((skb = alloc_skb(sksize, GFP_ATOMIC)) == (struct sk_buff *)0)
+			if ((skb = dev_alloc_skb(sksize)) == (struct sk_buff *)0)
 			{
 				printk("%s: could not alloc_skb(%d, GFP_ATOMIC).\n", dev->name, sksize);
 				lp->stats.rx_dropped++;
 			}
 			else
 			{
-				skb->len = pkt_len;
 				skb->dev = dev;
 
-				obram_read(ioaddr, rbd.rbd_bufl, skb->data, pkt_len);
+				obram_read(ioaddr, rbd.rbd_bufl, skb_put(skb,pkt_len), pkt_len);
 
 				if (wavelan_debug > 5)
 				{

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