From: Auke Kok Date: Thu, 31 Aug 2006 21:27:48 +0000 (-0700) Subject: e100: Convert e100 to use netdev_alloc_skb(). X-Git-Tag: v2.6.19-rc1~1263^2~64^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4187592b6d2230d4f9f7177c369dde2aef1a4337;p=karo-tx-linux.git e100: Convert e100 to use netdev_alloc_skb(). Signed-off-by: Auke Kok --- diff --git a/drivers/net/e100.c b/drivers/net/e100.c index b42ad76b1116..458af6a80bbb 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1759,7 +1759,7 @@ static inline void e100_start_receiver(struct nic *nic, struct rx *rx) #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN) static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) { - if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN))) + if(!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + NET_IP_ALIGN))) return -ENOMEM; /* Align, init, and map the RFD. */ @@ -2139,7 +2139,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) e100_start_receiver(nic, NULL); - if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) { + if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) { err = -ENOMEM; goto err_loopback_none; }