diff options
author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:50:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:52:27 -0500 |
commit | c056b734e54e12f38f34a2583a4824e6cecc16c1 (patch) | |
tree | 78e501091b9f99477e9b919c03fd5b1930a46198 /drivers/net/ethernet/microchip | |
parent | 21a4e46995fa1a76281ac0281ff837f706231a37 (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/microchip')
-rw-r--r-- | drivers/net/ethernet/microchip/enc28j60.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index c813e5d8db9d..1d6b7ce3e1ee 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c | |||
@@ -954,14 +954,13 @@ static void enc28j60_hw_rx(struct net_device *ndev) | |||
954 | if (len > MAX_FRAMELEN) | 954 | if (len > MAX_FRAMELEN) |
955 | ndev->stats.rx_over_errors++; | 955 | ndev->stats.rx_over_errors++; |
956 | } else { | 956 | } else { |
957 | skb = dev_alloc_skb(len + NET_IP_ALIGN); | 957 | skb = netdev_alloc_skb(ndev, len + NET_IP_ALIGN); |
958 | if (!skb) { | 958 | if (!skb) { |
959 | if (netif_msg_rx_err(priv)) | 959 | if (netif_msg_rx_err(priv)) |
960 | dev_err(&ndev->dev, | 960 | dev_err(&ndev->dev, |
961 | "out of memory for Rx'd frame\n"); | 961 | "out of memory for Rx'd frame\n"); |
962 | ndev->stats.rx_dropped++; | 962 | ndev->stats.rx_dropped++; |
963 | } else { | 963 | } else { |
964 | skb->dev = ndev; | ||
965 | skb_reserve(skb, NET_IP_ALIGN); | 964 | skb_reserve(skb, NET_IP_ALIGN); |
966 | /* copy the packet from the receive buffer */ | 965 | /* copy the packet from the receive buffer */ |
967 | enc28j60_mem_read(priv, | 966 | enc28j60_mem_read(priv, |