summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliezer Tamir <eliezer.tamir@linux.intel.com>2013-08-04 12:55:48 +0300
committerDavid S. Miller <davem@davemloft.net>2013-08-04 19:41:27 -0700
commitbf37d2b3fdc9e451f9e376a3922ac8df5aa24128 (patch)
treed773645ff3e9689f40ac6072c284eed178c2c154
parent136d8f377e1575463b47840bc5f1b22d94bf8f63 (diff)
downloadlinux-stable-bf37d2b3fdc9e451f9e376a3922ac8df5aa24128.tar.gz
linux-stable-bf37d2b3fdc9e451f9e376a3922ac8df5aa24128.tar.bz2
linux-stable-bf37d2b3fdc9e451f9e376a3922ac8df5aa24128.zip
busy_poll: cleanup do-nothing placeholders
When renaming ll_poll to busy poll, I introduced a typo in the name of the do-nothing placeholder for sk_busy_loop and called it sk_busy_poll. This broke compile when busy poll was not configured. Cong Wang submitted a patch to fixed that. This patch removes the now redundant, misspelled placeholder. Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/busy_poll.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index f18b91966d3d..8e2dfc106aed 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -162,11 +162,6 @@ static inline bool sk_can_busy_loop(struct sock *sk)
return false;
}
-static inline bool sk_busy_poll(struct sock *sk, int nonblock)
-{
- return false;
-}
-
static inline void skb_mark_napi_id(struct sk_buff *skb,
struct napi_struct *napi)
{