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/via | |
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/via')
-rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/via/via-velocity.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 1b95daa372c4..cb2ff28a0602 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c | |||
@@ -1155,7 +1155,6 @@ static void alloc_rbufs(struct net_device *dev) | |||
1155 | rp->rx_skbuff[i] = skb; | 1155 | rp->rx_skbuff[i] = skb; |
1156 | if (skb == NULL) | 1156 | if (skb == NULL) |
1157 | break; | 1157 | break; |
1158 | skb->dev = dev; /* Mark as being used by this device. */ | ||
1159 | 1158 | ||
1160 | rp->rx_skbuff_dma[i] = | 1159 | rp->rx_skbuff_dma[i] = |
1161 | pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz, | 1160 | pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz, |
@@ -1940,7 +1939,6 @@ static int rhine_rx(struct net_device *dev, int limit) | |||
1940 | rp->rx_skbuff[entry] = skb; | 1939 | rp->rx_skbuff[entry] = skb; |
1941 | if (skb == NULL) | 1940 | if (skb == NULL) |
1942 | break; /* Better luck next round. */ | 1941 | break; /* Better luck next round. */ |
1943 | skb->dev = dev; /* Mark as being used by this device. */ | ||
1944 | rp->rx_skbuff_dma[entry] = | 1942 | rp->rx_skbuff_dma[entry] = |
1945 | pci_map_single(rp->pdev, skb->data, | 1943 | pci_map_single(rp->pdev, skb->data, |
1946 | rp->rx_buf_sz, | 1944 | rp->rx_buf_sz, |
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index 2776bbc67936..cf69cbf6fec3 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -1509,7 +1509,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx) | |||
1509 | struct rx_desc *rd = &(vptr->rx.ring[idx]); | 1509 | struct rx_desc *rd = &(vptr->rx.ring[idx]); |
1510 | struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]); | 1510 | struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]); |
1511 | 1511 | ||
1512 | rd_info->skb = dev_alloc_skb(vptr->rx.buf_sz + 64); | 1512 | rd_info->skb = netdev_alloc_skb(vptr->dev, vptr->rx.buf_sz + 64); |
1513 | if (rd_info->skb == NULL) | 1513 | if (rd_info->skb == NULL) |
1514 | return -ENOMEM; | 1514 | return -ENOMEM; |
1515 | 1515 | ||