diff options
author | Pradeep A. Dalvi <netdev@pradeepdalvi.com> | 2012-02-06 06:16:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-08 18:46:38 -0500 |
commit | dae2e9f430c46c29e3f771110094bd3da3625aa4 (patch) | |
tree | b78b2671d2566ea5795349e5dadf8ef786b507f5 /drivers/net/ethernet/sis | |
parent | c4062dfc425e94290ac427a98d6b4721dd2bc91f (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/sis')
-rw-r--r-- | drivers/net/ethernet/sis/sis900.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index 91c44688bc3e..f968898c86db 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c | |||
@@ -1166,7 +1166,7 @@ sis900_init_rx_ring(struct net_device *net_dev) | |||
1166 | for (i = 0; i < NUM_RX_DESC; i++) { | 1166 | for (i = 0; i < NUM_RX_DESC; i++) { |
1167 | struct sk_buff *skb; | 1167 | struct sk_buff *skb; |
1168 | 1168 | ||
1169 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { | 1169 | if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) { |
1170 | /* not enough memory for skbuff, this makes a "hole" | 1170 | /* not enough memory for skbuff, this makes a "hole" |
1171 | on the buffer ring, it is not clear how the | 1171 | on the buffer ring, it is not clear how the |
1172 | hardware will react to this kind of degenerated | 1172 | hardware will react to this kind of degenerated |
@@ -1769,7 +1769,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1769 | 1769 | ||
1770 | /* refill the Rx buffer, what if there is not enough | 1770 | /* refill the Rx buffer, what if there is not enough |
1771 | * memory for new socket buffer ?? */ | 1771 | * memory for new socket buffer ?? */ |
1772 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { | 1772 | if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) { |
1773 | /* | 1773 | /* |
1774 | * Not enough memory to refill the buffer | 1774 | * Not enough memory to refill the buffer |
1775 | * so we need to recycle the old one so | 1775 | * so we need to recycle the old one so |
@@ -1827,7 +1827,7 @@ refill_rx_ring: | |||
1827 | entry = sis_priv->dirty_rx % NUM_RX_DESC; | 1827 | entry = sis_priv->dirty_rx % NUM_RX_DESC; |
1828 | 1828 | ||
1829 | if (sis_priv->rx_skbuff[entry] == NULL) { | 1829 | if (sis_priv->rx_skbuff[entry] == NULL) { |
1830 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { | 1830 | if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) { |
1831 | /* not enough memory for skbuff, this makes a | 1831 | /* not enough memory for skbuff, this makes a |
1832 | * "hole" on the buffer ring, it is not clear | 1832 | * "hole" on the buffer ring, it is not clear |
1833 | * how the hardware will react to this kind | 1833 | * how the hardware will react to this kind |