diff options
author | Pradeep A. Dalvi <netdev@pradeepdalvi.com> | 2012-02-06 06:16:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-08 18:46:38 -0500 |
commit | 1ab0d2ec9aeb4489c05158e8a2b00bad89f67e03 (patch) | |
tree | 212a334c85c3a6f03f8ada4502344ff3ec31c5f2 /drivers/net/ethernet/adi | |
parent | dae2e9f430c46c29e3f771110094bd3da3625aa4 (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/adi')
-rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c index 525a9768bb5..49733696703 100644 --- a/drivers/net/ethernet/adi/bfin_mac.c +++ b/drivers/net/ethernet/adi/bfin_mac.c | |||
@@ -113,7 +113,7 @@ static void desc_list_free(void) | |||
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | static int desc_list_init(void) | 116 | static int desc_list_init(struct net_device *dev) |
117 | { | 117 | { |
118 | int i; | 118 | int i; |
119 | struct sk_buff *new_skb; | 119 | struct sk_buff *new_skb; |
@@ -187,7 +187,7 @@ static int desc_list_init(void) | |||
187 | struct dma_descriptor *b = &(r->desc_b); | 187 | struct dma_descriptor *b = &(r->desc_b); |
188 | 188 | ||
189 | /* allocate a new skb for next time receive */ | 189 | /* allocate a new skb for next time receive */ |
190 | new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN); | 190 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); |
191 | if (!new_skb) { | 191 | if (!new_skb) { |
192 | pr_notice("init: low on mem - packet dropped\n"); | 192 | pr_notice("init: low on mem - packet dropped\n"); |
193 | goto init_error; | 193 | goto init_error; |
@@ -1090,7 +1090,7 @@ static void bfin_mac_rx(struct net_device *dev) | |||
1090 | /* allocate a new skb for next time receive */ | 1090 | /* allocate a new skb for next time receive */ |
1091 | skb = current_rx_ptr->skb; | 1091 | skb = current_rx_ptr->skb; |
1092 | 1092 | ||
1093 | new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN); | 1093 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); |
1094 | if (!new_skb) { | 1094 | if (!new_skb) { |
1095 | netdev_notice(dev, "rx: low on mem - packet dropped\n"); | 1095 | netdev_notice(dev, "rx: low on mem - packet dropped\n"); |
1096 | dev->stats.rx_dropped++; | 1096 | dev->stats.rx_dropped++; |
@@ -1397,7 +1397,7 @@ static int bfin_mac_open(struct net_device *dev) | |||
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | /* initial rx and tx list */ | 1399 | /* initial rx and tx list */ |
1400 | ret = desc_list_init(); | 1400 | ret = desc_list_init(dev); |
1401 | if (ret) | 1401 | if (ret) |
1402 | return ret; | 1402 | return ret; |
1403 | 1403 | ||