---

yaml --- r: 102679 b: refs/heads/master c: e83728c h: refs/heads/master i: 102677: 73c514b 102675: ea40823 102671: b7bb690 v: v3
git-mirror · May 31, 2008 · 11d46cd · 11d46cd
1 parent bb15378
commit 11d46cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7d6b7d20f42996b28b6a26587a081ce0fc37304
+refs/heads/master: e83728c7b0ce92e57aa90eb4fc271a29d7a393d5
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
@@ -585,16 +585,13 @@ static inline int rx_refill(struct net_device *ndev, gfp_t gfp)
 	for (i=0; i<NR_RX_DESC; i++) {
 		struct sk_buff *skb;
 		long res;
+
 		/* extra 16 bytes for alignment */
-		skb = __dev_alloc_skb(REAL_RX_BUF_SIZE+16, gfp);
+		skb = __netdev_alloc_skb(ndev, REAL_RX_BUF_SIZE+16, gfp);
 		if (unlikely(!skb))
 			break;
 
-		res = (long)skb->data & 0xf;
-		res = 0x10 - res;
-		res &= 0xf;
-		skb_reserve(skb, res);
-
+		skb_reserve(skb, skb->data - PTR_ALIGN(skb->data, 16));
 		if (gfp != GFP_ATOMIC)
 			spin_lock_irqsave(&dev->rx_info.lock, flags);
 		res = ns83820_add_rx_skb(dev, skb);