diff options
| author |   Alexander Duyck <alexander.h.duyck@redhat.com> | 2014-12-09 19:40:56 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-12-10 13:31:57 -0500 |
| commit | 67fd893ee07db94bcef6c7537f8569b49ff124d4 (patch) | |
| tree | 4d0972f930eac9c337238b2cf1d875d911730917 /drivers/net/ethernet/intel/e1000/e1000_main.c | |
| parent | net: Pull out core bits of __netdev_alloc_skb and add __napi_alloc_skb (diff) | |
| download | linux-dev-67fd893ee07db94bcef6c7537f8569b49ff124d4.tar.xz linux-dev-67fd893ee07db94bcef6c7537f8569b49ff124d4.zip | |
ethernet/intel: Use napi_alloc_skb
This change replaces calls to netdev_alloc_skb_ip_align with
napi_alloc_skb. The advantage of napi_alloc_skb is currently the fact that
the page allocation doesn't make use of any irq disable calls.
There are few spots where I couldn't replace the calls as the buffer
allocation routine is called as a part of init which is outside of the
softirq context.
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 862d1989ae1c..83140cbb5f01 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -4100,7 +4100,7 @@ static bool e1000_tbi_should_accept(struct e1000_adapter *adapter, static struct sk_buff *e1000_alloc_rx_skb(struct e1000_adapter *adapter, unsigned int bufsz) { - struct sk_buff *skb = netdev_alloc_skb_ip_align(adapter->netdev, bufsz); + struct sk_buff *skb = napi_alloc_skb(&adapter->napi, bufsz); if (unlikely(!skb)) adapter->alloc_rx_buff_failed++; |