diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-07-28 15:53:41 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-07-29 19:50:16 +0100 |
| commit | a20e6149b3aceaf9c5ded756ec6665d3866f640e (patch) | |
| tree | e9930d35d52e5f5e65e7202c2325d3f243f4ae97 /target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch | |
| parent | f2961c9c2be6873536fc68bed4bf2da6f3746c98 (diff) | |
| download | upstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.tar.gz upstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.tar.bz2 upstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.zip | |
kernel: bump 5.10 to 5.10.54
Deleted (upstreamed) patches:
mediatek/patches-5.10/000-spi-fix-fifo.patch
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch b/target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch index 7f92a1307d..b036b5852e 100644 --- a/target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch +++ b/target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6779,15 +6779,10 @@ void __netif_napi_del(struct napi_struct +@@ -6793,15 +6793,10 @@ void __netif_napi_del(struct napi_struct } EXPORT_SYMBOL(__netif_napi_del); @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> weight = n->weight; /* This NAPI_STATE_SCHED test is for avoiding a race -@@ -6807,7 +6802,7 @@ static int napi_poll(struct napi_struct +@@ -6821,7 +6816,7 @@ static int napi_poll(struct napi_struct n->poll, work, weight); if (likely(work < weight)) @@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Drivers must not modify the NAPI state if they * consume the entire weight. In such cases this code -@@ -6816,7 +6811,7 @@ static int napi_poll(struct napi_struct +@@ -6830,7 +6825,7 @@ static int napi_poll(struct napi_struct */ if (unlikely(napi_disable_pending(n))) { napi_complete(n); @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } if (n->gro_bitmask) { -@@ -6834,12 +6829,29 @@ static int napi_poll(struct napi_struct +@@ -6848,12 +6843,29 @@ static int napi_poll(struct napi_struct if (unlikely(!list_empty(&n->poll_list))) { pr_warn_once("%s: Budget exhausted after napi rescheduled\n", n->dev ? n->dev->name : "backlog"); |