lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: use netdev_alloc_skb

Browse Source 
Use netdev_alloc_skb and remove the useless sk_buff * argument of
rtl8169_alloc_rx_skb.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
This commit is contained in:
Stephen Hemminger
2007-06-16 22:36:41 +02:00
committed by Jeff Garzik
parent a73b629b35
commit 15d317587e
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/r8169.c
View File

@@ -1997,31 +1997,28 @@ static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
rtl8169_mark_to_asic(desc, rx_buf_sz); rtl8169_mark_to_asic(desc, rx_buf_sz);
} }
static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff, static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev,
struct RxDesc *desc, int rx_buf_sz, struct net_device *dev,
unsigned int align) struct RxDesc *desc, int rx_buf_sz,
unsigned int align)
{ {
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t mapping; dma_addr_t mapping;
int ret = 0;
skb = dev_alloc_skb(rx_buf_sz + align); skb = netdev_alloc_skb(dev, rx_buf_sz + align);
if (!skb) if (!skb)
goto err_out; goto err_out;
skb_reserve(skb, (align - 1) & (unsigned long)skb->data); skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
*sk_buff = skb;
mapping = pci_map_single(pdev, skb->data, rx_buf_sz, mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
rtl8169_map_to_asic(desc, mapping, rx_buf_sz); rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
out: out:
return ret; return skb;
err_out: err_out:
ret = -ENOMEM;
rtl8169_make_unusable_by_asic(desc); rtl8169_make_unusable_by_asic(desc);
goto out; goto out;
} }
@@ -2044,15 +2041,19 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
u32 cur; u32 cur;
for (cur = start; end - cur > 0; cur++) { for (cur = start; end - cur > 0; cur++) {
int ret, i = cur % NUM_RX_DESC; struct sk_buff *skb;
unsigned int i = cur % NUM_RX_DESC;
if (tp->Rx_skbuff[i]) if (tp->Rx_skbuff[i])
continue; continue;
ret = rtl8169_alloc_rx_skb(tp->pci_dev, tp->Rx_skbuff + i, skb = rtl8169_alloc_rx_skb(tp->pci_dev, dev,
tp->RxDescArray + i, tp->rx_buf_sz, tp->align); tp->RxDescArray + i,
if (ret < 0) tp->rx_buf_sz, tp->align);
if (!skb)
break; break;
tp->Rx_skbuff[i] = skb;
} }
return cur - start; return cur - start;
} }