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/neterion/s2io.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/neterion/s2io.c')
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 13858460880..44a6065794c 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -2524,7 +2524,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring, | |||
2524 | size = ring->mtu + ALIGN_SIZE + BUF0_LEN + 4; | 2524 | size = ring->mtu + ALIGN_SIZE + BUF0_LEN + 4; |
2525 | 2525 | ||
2526 | /* allocate skb */ | 2526 | /* allocate skb */ |
2527 | skb = dev_alloc_skb(size); | 2527 | skb = netdev_alloc_skb(nic->dev, size); |
2528 | if (!skb) { | 2528 | if (!skb) { |
2529 | DBG_PRINT(INFO_DBG, "%s: Could not allocate skb\n", | 2529 | DBG_PRINT(INFO_DBG, "%s: Could not allocate skb\n", |
2530 | ring->dev->name); | 2530 | ring->dev->name); |
@@ -6820,7 +6820,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, | |||
6820 | */ | 6820 | */ |
6821 | rxdp1->Buffer0_ptr = *temp0; | 6821 | rxdp1->Buffer0_ptr = *temp0; |
6822 | } else { | 6822 | } else { |
6823 | *skb = dev_alloc_skb(size); | 6823 | *skb = netdev_alloc_skb(dev, size); |
6824 | if (!(*skb)) { | 6824 | if (!(*skb)) { |
6825 | DBG_PRINT(INFO_DBG, | 6825 | DBG_PRINT(INFO_DBG, |
6826 | "%s: Out of memory to allocate %s\n", | 6826 | "%s: Out of memory to allocate %s\n", |
@@ -6849,7 +6849,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, | |||
6849 | rxdp3->Buffer0_ptr = *temp0; | 6849 | rxdp3->Buffer0_ptr = *temp0; |
6850 | rxdp3->Buffer1_ptr = *temp1; | 6850 | rxdp3->Buffer1_ptr = *temp1; |
6851 | } else { | 6851 | } else { |
6852 | *skb = dev_alloc_skb(size); | 6852 | *skb = netdev_alloc_skb(dev, size); |
6853 | if (!(*skb)) { | 6853 | if (!(*skb)) { |
6854 | DBG_PRINT(INFO_DBG, | 6854 | DBG_PRINT(INFO_DBG, |
6855 | "%s: Out of memory to allocate %s\n", | 6855 | "%s: Out of memory to allocate %s\n", |