diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-02-10 05:46:46 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-13 22:23:39 -0500 |
| commit | 37fabbf4d489cc2e1cbf7cde816d9453a65ddfb7 (patch) | |
| tree | 767cf16a3f51ff5f4c2181ecd892ed5fbc53a3bc | |
| parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
| download | linux-dev-37fabbf4d489cc2e1cbf7cde816d9453a65ddfb7.tar.xz linux-dev-37fabbf4d489cc2e1cbf7cde816d9453a65ddfb7.zip | |
net: busy-poll: remove LL_FLUSH_FAILED and LL_FLUSH_BUSY
Commit 79e7fff47b7b ("net: remove support for per driver
ndo_busy_poll()") made them obsolete.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/busy_poll.h | 4 | ||||
| -rw-r--r-- | net/core/dev.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index d73b849e29a6..b8d637225a07 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -33,10 +33,6 @@ struct napi_struct; extern unsigned int sysctl_net_busy_read __read_mostly; extern unsigned int sysctl_net_busy_poll __read_mostly; -/* return values from ndo_ll_poll */ -#define LL_FLUSH_FAILED -1 -#define LL_FLUSH_BUSY -2 - static inline bool net_busy_loop_on(void) { return sysctl_net_busy_poll; diff --git a/net/core/dev.c b/net/core/dev.c index 363c44b9be63..2f1bbe1bf67c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5008,9 +5008,6 @@ count: LINUX_MIB_BUSYPOLLRXPACKETS, rc); local_bh_enable(); - if (rc == LL_FLUSH_FAILED) - break; /* permanent failure */ - if (nonblock || !skb_queue_empty(&sk->sk_receive_queue) || busy_loop_timeout(end_time)) break; |