diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-04-16 16:37:35 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-30 22:19:22 -0400 |
| commit | e83728c7b0ce92e57aa90eb4fc271a29d7a393d5 (patch) | |
| tree | 2a1495f14281e11b98d95225832e17d4963f1e0f /drivers/net/ns83820.c | |
| parent | c7d6b7d20f42996b28b6a26587a081ce0fc37304 (diff) | |
| download | op-kernel-dev-e83728c7b0ce92e57aa90eb4fc271a29d7a393d5.zip op-kernel-dev-e83728c7b0ce92e57aa90eb4fc271a29d7a393d5.tar.gz | |
ns8320: use netdev_alloc_skb
Use netdev_alloc_skb. This sets skb->dev and allows arch specific
allocation.
Compile tested only.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index b42c05f..ff44961 100644 --- a/drivers/net/ns83820.c +++ b/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); |
