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/micrel/ks8695net.c | |
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/micrel/ks8695net.c')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8695net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c index 7c717276502f..dccae1d1743a 100644 --- a/drivers/net/ethernet/micrel/ks8695net.c +++ b/drivers/net/ethernet/micrel/ks8695net.c | |||
@@ -278,7 +278,8 @@ ks8695_refill_rxbuffers(struct ks8695_priv *ksp) | |||
278 | 278 | ||
279 | for (buff_n = 0; buff_n < MAX_RX_DESC; ++buff_n) { | 279 | for (buff_n = 0; buff_n < MAX_RX_DESC; ++buff_n) { |
280 | if (!ksp->rx_buffers[buff_n].skb) { | 280 | if (!ksp->rx_buffers[buff_n].skb) { |
281 | struct sk_buff *skb = dev_alloc_skb(MAX_RXBUF_SIZE); | 281 | struct sk_buff *skb = |
282 | netdev_alloc_skb(ksp->ndev, MAX_RXBUF_SIZE); | ||
282 | dma_addr_t mapping; | 283 | dma_addr_t mapping; |
283 | 284 | ||
284 | ksp->rx_buffers[buff_n].skb = skb; | 285 | ksp->rx_buffers[buff_n].skb = skb; |
@@ -299,7 +300,6 @@ ks8695_refill_rxbuffers(struct ks8695_priv *ksp) | |||
299 | break; | 300 | break; |
300 | } | 301 | } |
301 | ksp->rx_buffers[buff_n].dma_ptr = mapping; | 302 | ksp->rx_buffers[buff_n].dma_ptr = mapping; |
302 | skb->dev = ksp->ndev; | ||
303 | ksp->rx_buffers[buff_n].length = MAX_RXBUF_SIZE; | 303 | ksp->rx_buffers[buff_n].length = MAX_RXBUF_SIZE; |
304 | 304 | ||
305 | /* Record this into the DMA ring */ | 305 | /* Record this into the DMA ring */ |