kernel: bump 5.4 to 5.4.60

[openwrt/openwrt.git] / target / linux / generic / pending-5.4 / 690-net-add-support-for-threaded-NAPI-polling.patch

diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index 0fd837d45eac17f4156623617a0031db2d66ef6d..25446458094519f391f41f865362065be88b79f0 100644 (file)
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -226,7 +226,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        have = netpoll_poll_lock(n);
  
 -      weight = n->weight;
--
++      work = __napi_poll(n, &do_repoll);
+ 
 -      /* This NAPI_STATE_SCHED test is for avoiding a race
 -       * with netpoll's poll_napi().  Only the entity which
 -       * obtains the lock and sees NAPI_STATE_SCHED set will
@@ -243,8 +244,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -
 -      if (likely(work < weight))
 -              goto out_unlock;
-+      work = __napi_poll(n, &do_repoll);
- 
+-
 -      /* Drivers must not modify the NAPI state if they
 -       * consume the entire weight.  In such cases this code
 -       * still "owns" the NAPI instance and therefore can