diff options
| author |   Cong Wang <amwang@redhat.com> | 2013-08-01 11:10:25 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-08-01 15:11:17 -0700 |
| commit | e0d1095ae3405404d247afb00233ef837d58da83 (patch) | |
| tree | 1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720 /net/core/skbuff.c | |
| parent | net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set (diff) | |
| download | linux-dev-e0d1095ae3405404d247afb00233ef837d58da83.tar.xz linux-dev-e0d1095ae3405404d247afb00233ef837d58da83.zip | |
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 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3df4d4ccf440..2c3d0f53d198 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -740,7 +740,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) skb_copy_secmark(new, old); -#ifdef CONFIG_NET_LL_RX_POLL +#ifdef CONFIG_NET_RX_BUSY_POLL new->napi_id = old->napi_id; #endif } |