iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[E1000]: Convert to netdev_alloc_skb

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-07-31 22:39:40 -07:00
parent a20e9c6291
commit 87f5032e0c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/e1000/e1000_main.c
View File

@ -3127,7 +3127,7 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
break; break;
} }
/* NOTE: dev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
* means we reserve 2 more, this pushes us to allocate from the next * means we reserve 2 more, this pushes us to allocate from the next
* larger slab size * larger slab size
* i.e. RXBUFFER_2048 --> size-4096 slab */ * i.e. RXBUFFER_2048 --> size-4096 slab */
@ -3708,7 +3708,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
#define E1000_CB_LENGTH 256 #define E1000_CB_LENGTH 256
if (length < E1000_CB_LENGTH) { if (length < E1000_CB_LENGTH) {
struct sk_buff *new_skb = struct sk_buff *new_skb =
dev_alloc_skb(length + NET_IP_ALIGN); netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
if (new_skb) { if (new_skb) {
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
new_skb->dev = netdev; new_skb->dev = netdev;
@ -3979,7 +3979,7 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
while (cleaned_count--) { while (cleaned_count--) {
if (!(skb = buffer_info->skb)) if (!(skb = buffer_info->skb))
skb = dev_alloc_skb(bufsz); skb = netdev_alloc_skb(netdev, bufsz);
else { else {
skb_trim(skb, 0); skb_trim(skb, 0);
goto map_skb; goto map_skb;
@ -3997,7 +3997,7 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
DPRINTK(RX_ERR, ERR, "skb align check failed: %u bytes " DPRINTK(RX_ERR, ERR, "skb align check failed: %u bytes "
"at %p\n", bufsz, skb->data); "at %p\n", bufsz, skb->data);
/* Try again, without freeing the previous */ /* Try again, without freeing the previous */
skb = dev_alloc_skb(bufsz); skb = netdev_alloc_skb(netdev, bufsz);
/* Failed allocation, critical failure */ /* Failed allocation, critical failure */
if (!skb) { if (!skb) {
dev_kfree_skb(oldskb); dev_kfree_skb(oldskb);
@ -4121,7 +4121,8 @@ e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
rx_desc->read.buffer_addr[j+1] = ~0; rx_desc->read.buffer_addr[j+1] = ~0;
} }
skb = dev_alloc_skb(adapter->rx_ps_bsize0 + NET_IP_ALIGN); skb = netdev_alloc_skb(netdev,
adapter->rx_ps_bsize0 + NET_IP_ALIGN);
if (unlikely(!skb)) { if (unlikely(!skb)) {
adapter->alloc_rx_buff_failed++; adapter->alloc_rx_buff_failed++;