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/tehuti/tehuti.c | |
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/tehuti/tehuti.c')
-rw-r--r-- | drivers/net/ethernet/tehuti/tehuti.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index df7febba9ea6..ad973ffc9ff3 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c | |||
@@ -1089,12 +1089,11 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f) | |||
1089 | ENTER; | 1089 | ENTER; |
1090 | dno = bdx_rxdb_available(db) - 1; | 1090 | dno = bdx_rxdb_available(db) - 1; |
1091 | while (dno > 0) { | 1091 | while (dno > 0) { |
1092 | skb = dev_alloc_skb(f->m.pktsz + NET_IP_ALIGN); | 1092 | skb = netdev_alloc_skb(priv->ndev, f->m.pktsz + NET_IP_ALIGN); |
1093 | if (!skb) { | 1093 | if (!skb) { |
1094 | pr_err("NO MEM: dev_alloc_skb failed\n"); | 1094 | pr_err("NO MEM: netdev_alloc_skb failed\n"); |
1095 | break; | 1095 | break; |
1096 | } | 1096 | } |
1097 | skb->dev = priv->ndev; | ||
1098 | skb_reserve(skb, NET_IP_ALIGN); | 1097 | skb_reserve(skb, NET_IP_ALIGN); |
1099 | 1098 | ||
1100 | idx = bdx_rxdb_alloc_elem(db); | 1099 | idx = bdx_rxdb_alloc_elem(db); |
@@ -1258,7 +1257,7 @@ static int bdx_rx_receive(struct bdx_priv *priv, struct rxd_fifo *f, int budget) | |||
1258 | skb = dm->skb; | 1257 | skb = dm->skb; |
1259 | 1258 | ||
1260 | if (len < BDX_COPYBREAK && | 1259 | if (len < BDX_COPYBREAK && |
1261 | (skb2 = dev_alloc_skb(len + NET_IP_ALIGN))) { | 1260 | (skb2 = netdev_alloc_skb(priv->ndev, len + NET_IP_ALIGN))) { |
1262 | skb_reserve(skb2, NET_IP_ALIGN); | 1261 | skb_reserve(skb2, NET_IP_ALIGN); |
1263 | /*skb_put(skb2, len); */ | 1262 | /*skb_put(skb2, len); */ |
1264 | pci_dma_sync_single_for_cpu(priv->pdev, | 1263 | pci_dma_sync_single_for_cpu(priv->pdev, |