diff options
author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:50:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:52:27 -0500 |
commit | c056b734e54e12f38f34a2583a4824e6cecc16c1 (patch) | |
tree | 78e501091b9f99477e9b919c03fd5b1930a46198 /drivers/net/ethernet/hp | |
parent | 21a4e46995fa1a76281ac0281ff837f706231a37 (diff) |
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hp')
-rw-r--r-- | drivers/net/ethernet/hp/hp100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c index 3598c5408e7..d496673f090 100644 --- a/drivers/net/ethernet/hp/hp100.c +++ b/drivers/net/ethernet/hp/hp100.c | |||
@@ -1274,7 +1274,7 @@ static int hp100_build_rx_pdl(hp100_ring_t * ringptr, | |||
1274 | /* Note: This depends on the alloc_skb functions allocating more | 1274 | /* Note: This depends on the alloc_skb functions allocating more |
1275 | * space than requested, i.e. aligning to 16bytes */ | 1275 | * space than requested, i.e. aligning to 16bytes */ |
1276 | 1276 | ||
1277 | ringptr->skb = dev_alloc_skb(roundup(MAX_ETHER_SIZE + 2, 4)); | 1277 | ringptr->skb = netdev_alloc_skb(dev, roundup(MAX_ETHER_SIZE + 2, 4)); |
1278 | 1278 | ||
1279 | if (NULL != ringptr->skb) { | 1279 | if (NULL != ringptr->skb) { |
1280 | /* | 1280 | /* |
@@ -1284,7 +1284,6 @@ static int hp100_build_rx_pdl(hp100_ring_t * ringptr, | |||
1284 | */ | 1284 | */ |
1285 | skb_reserve(ringptr->skb, 2); | 1285 | skb_reserve(ringptr->skb, 2); |
1286 | 1286 | ||
1287 | ringptr->skb->dev = dev; | ||
1288 | ringptr->skb->data = (u_char *) skb_put(ringptr->skb, MAX_ETHER_SIZE); | 1287 | ringptr->skb->data = (u_char *) skb_put(ringptr->skb, MAX_ETHER_SIZE); |
1289 | 1288 | ||
1290 | /* ringptr->pdl points to the beginning of the PDL, i.e. the PDH */ | 1289 | /* ringptr->pdl points to the beginning of the PDL, i.e. the PDH */ |
@@ -1817,7 +1816,7 @@ static void hp100_rx(struct net_device *dev) | |||
1817 | #endif | 1816 | #endif |
1818 | 1817 | ||
1819 | /* Now we allocate the skb and transfer the data into it. */ | 1818 | /* Now we allocate the skb and transfer the data into it. */ |
1820 | skb = dev_alloc_skb(pkt_len+2); | 1819 | skb = netdev_alloc_skb(dev, pkt_len + 2); |
1821 | if (skb == NULL) { /* Not enough memory->drop packet */ | 1820 | if (skb == NULL) { /* Not enough memory->drop packet */ |
1822 | #ifdef HP100_DEBUG | 1821 | #ifdef HP100_DEBUG |
1823 | printk("hp100: %s: rx: couldn't allocate a sk_buff of size %d\n", | 1822 | printk("hp100: %s: rx: couldn't allocate a sk_buff of size %d\n", |