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

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

diff -u --recursive --new-file v1.3.5/linux/drivers/net/at1700.c linux/drivers/net/at1700.c
@@ -527,7 +527,7 @@
 				lp->stats.rx_errors++;
 				break;
 			}
-			skb = alloc_skb(pkt_len+1, GFP_ATOMIC);
+			skb = dev_alloc_skb(pkt_len+1);
 			if (skb == NULL) {
 				printk("%s: Memory squeeze, dropping packet (len %d).\n",
 					   dev->name, pkt_len);
@@ -540,7 +540,7 @@
 			skb->len = pkt_len;
 			skb->dev = dev;
 
-			insw(ioaddr + DATAPORT, skb->data, (pkt_len + 1) >> 1);
+			insw(ioaddr + DATAPORT, skb_put(skb,pkt_len), (pkt_len + 1) >> 1);
 			skb->protocol=eth_type_trans(skb, dev);
 			netif_rx(skb);
 			lp->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