aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/e1000.h
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-07-12 12:10:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-13 01:07:56 -0400
commitc2fed9965c60e1f989f57889357c557f7b907ab7 (patch)
treeadc5e1c7a20f1d31c2a8aa3959d1948bf484f91d /drivers/net/e1000e/e1000.h
parenta3d72d5d01b82a86f3b16ca1918d2040b1acba8c (diff)
e1000e: use GFP_KERNEL allocations at init time
In process and sleep allowed context, favor GFP_KERNEL allocations over GFP_ATOMIC ones. -v2: fixed checkpatch.pl warnings CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Ben Greear <greearb@candelatech.com> CC: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r--drivers/net/e1000e/e1000.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index e9d6e0ada543..638d175792cf 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -334,7 +334,7 @@ struct e1000_adapter {
334 int *work_done, int work_to_do) 334 int *work_done, int work_to_do)
335 ____cacheline_aligned_in_smp; 335 ____cacheline_aligned_in_smp;
336 void (*alloc_rx_buf) (struct e1000_adapter *adapter, 336 void (*alloc_rx_buf) (struct e1000_adapter *adapter,
337 int cleaned_count); 337 int cleaned_count, gfp_t gfp);
338 struct e1000_ring *rx_ring; 338 struct e1000_ring *rx_ring;
339 339
340 u32 rx_int_delay; 340 u32 rx_int_delay;