---

yaml --- r: 290051 b: refs/heads/master c: 7280f5a h: refs/heads/master i: 290049: e957018 290047: 25ab84a v: v3
git-mirror · Feb 7, 2012 · b7fa525 · b7fa525
1 parent dd3d220
commit b7fa525
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af2ce213f6e6b28497c5c932f43b94026b5a0363
+refs/heads/master: 7280f5ae0d71f2259a42d1f7603480809e4867fb
diff --git a/trunk/drivers/net/ethernet/natsemi/sonic.c b/trunk/drivers/net/ethernet/natsemi/sonic.c
@@ -422,7 +422,7 @@ static void sonic_rx(struct net_device *dev)
 		status = sonic_rda_get(dev, entry, SONIC_RD_STATUS);
 		if (status & SONIC_RCR_PRX) {
 			/* Malloc up new buffer. */
-			new_skb = netdev_alloc_skb(SONIC_RBSIZE + 2);
+			new_skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2);
 			if (new_skb == NULL) {
 				printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n", dev->name);
 				lp->stats.rx_dropped++;