2013-08-04 09:56:01

by Eliezer Tamir

Subject: [PATCH net] 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 <[email protected]>
---

include/net/busy_poll.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index f18b919..8e2dfc1 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)
{

2013-08-05 02:41:42

by David Miller

Subject: Re: [PATCH net] busy_poll: cleanup do-nothing placeholders

From: Eliezer Tamir <[email protected]>
Date: Sun, 04 Aug 2013 12:55:48 +0300

> 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 <[email protected]>

Applied, thanks.