From 11d46cd7e1af1084f683840b76b6bd0e1bf680c7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 16 Apr 2008 16:37:35 -0700
Subject: [PATCH] --- yaml --- r: 102679 b: refs/heads/master c:
 e83728c7b0ce92e57aa90eb4fc271a29d7a393d5 h: refs/heads/master i:   102677:
 73c514bb4a171fb226277dd3ac92390820df72f6   102675:
 ea40823701cf2e9bbea8e6cfdebc042124858c07   102671:
 b7bb6904cf13dbbfc08d0ae412b686ed1933f27f v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ns83820.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 01d8e2a89908..5d127ee060e1 100644
--- 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
index b42c05f84be1..ff449619f047 100644
--- 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);