diff options
author | Cong Wang <amwang@redhat.com> | 2013-07-31 23:10:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-01 18:11:17 -0400 |
commit | e0d1095ae3405404d247afb00233ef837d58da83 (patch) | |
tree | 1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720 /include/linux/skbuff.h | |
parent | dfcefb0be1231982784df2152213103ad33c1cfd (diff) |
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
Eliezer renames several *ll_poll to *busy_poll, but forgets
CONFIG_NET_LL_RX_POLL, so in case of confusion, rename it too.
Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 5afefa01a13c..3b71a4e83642 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -501,7 +501,7 @@ struct sk_buff { | |||
501 | /* 7/9 bit hole (depending on ndisc_nodetype presence) */ | 501 | /* 7/9 bit hole (depending on ndisc_nodetype presence) */ |
502 | kmemcheck_bitfield_end(flags2); | 502 | kmemcheck_bitfield_end(flags2); |
503 | 503 | ||
504 | #if defined CONFIG_NET_DMA || defined CONFIG_NET_LL_RX_POLL | 504 | #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL |
505 | union { | 505 | union { |
506 | unsigned int napi_id; | 506 | unsigned int napi_id; |
507 | dma_cookie_t dma_cookie; | 507 | dma_cookie_t dma_cookie; |