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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index d73b849e29a6869e282103f329c3a02f4e1a6882..b8d637225a07ddd2c0183b75a42cd5c9c5a69851 100644 (file)
--- 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 363c44b9be6368792382fad1a001292ced4398a0..2f1bbe1bf67c731252adb595364a3110eefbac30 100644 (file)
--- 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;