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/sun | |
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/sun')
-rw-r--r-- | drivers/net/ethernet/sun/cassini.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunbmac.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunqe.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 45292760fce4..b36edbd625dd 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c | |||
@@ -1974,7 +1974,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc, | |||
1974 | else | 1974 | else |
1975 | alloclen = max(hlen, RX_COPY_MIN); | 1975 | alloclen = max(hlen, RX_COPY_MIN); |
1976 | 1976 | ||
1977 | skb = dev_alloc_skb(alloclen + swivel + cp->crc_size); | 1977 | skb = netdev_alloc_skb(cp->dev, alloclen + swivel + cp->crc_size); |
1978 | if (skb == NULL) | 1978 | if (skb == NULL) |
1979 | return -1; | 1979 | return -1; |
1980 | 1980 | ||
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c index 220f724c3377..f359863b5340 100644 --- a/drivers/net/ethernet/sun/sunbmac.c +++ b/drivers/net/ethernet/sun/sunbmac.c | |||
@@ -853,7 +853,7 @@ static void bigmac_rx(struct bigmac *bp) | |||
853 | /* Trim the original skb for the netif. */ | 853 | /* Trim the original skb for the netif. */ |
854 | skb_trim(skb, len); | 854 | skb_trim(skb, len); |
855 | } else { | 855 | } else { |
856 | struct sk_buff *copy_skb = dev_alloc_skb(len + 2); | 856 | struct sk_buff *copy_skb = netdev_alloc_skb(bp->dev, len + 2); |
857 | 857 | ||
858 | if (copy_skb == NULL) { | 858 | if (copy_skb == NULL) { |
859 | drops++; | 859 | drops++; |
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 09c518655db2..8b627e2f798d 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c | |||
@@ -2043,7 +2043,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev) | |||
2043 | /* Trim the original skb for the netif. */ | 2043 | /* Trim the original skb for the netif. */ |
2044 | skb_trim(skb, len); | 2044 | skb_trim(skb, len); |
2045 | } else { | 2045 | } else { |
2046 | struct sk_buff *copy_skb = dev_alloc_skb(len + 2); | 2046 | struct sk_buff *copy_skb = netdev_alloc_skb(dev, len + 2); |
2047 | 2047 | ||
2048 | if (copy_skb == NULL) { | 2048 | if (copy_skb == NULL) { |
2049 | drops++; | 2049 | drops++; |
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c index b28f74367ebe..b42d1c5a6ca1 100644 --- a/drivers/net/ethernet/sun/sunqe.c +++ b/drivers/net/ethernet/sun/sunqe.c | |||
@@ -435,7 +435,7 @@ static void qe_rx(struct sunqe *qep) | |||
435 | dev->stats.rx_length_errors++; | 435 | dev->stats.rx_length_errors++; |
436 | dev->stats.rx_dropped++; | 436 | dev->stats.rx_dropped++; |
437 | } else { | 437 | } else { |
438 | skb = dev_alloc_skb(len + 2); | 438 | skb = netdev_alloc_skb(dev, len + 2); |
439 | if (skb == NULL) { | 439 | if (skb == NULL) { |
440 | drops++; | 440 | drops++; |
441 | dev->stats.rx_dropped++; | 441 | dev->stats.rx_dropped++; |