From a395cd00d23602bfa9c568593e7b9a8f5b258ab1 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Mon, 19 Jul 2021 09:59:05 +0100 Subject: kernel: bump 5.10 to 5.10.51 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- ...v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch') 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 877ccb2aee..7f92a1307d 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 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6772,15 +6772,10 @@ void __netif_napi_del(struct napi_struct +@@ -6779,15 +6779,10 @@ void __netif_napi_del(struct napi_struct } EXPORT_SYMBOL(__netif_napi_del); @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller weight = n->weight; /* This NAPI_STATE_SCHED test is for avoiding a race -@@ -6800,7 +6795,7 @@ static int napi_poll(struct napi_struct +@@ -6807,7 +6802,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 /* Drivers must not modify the NAPI state if they * consume the entire weight. In such cases this code -@@ -6809,7 +6804,7 @@ static int napi_poll(struct napi_struct +@@ -6816,7 +6811,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 } if (n->gro_bitmask) { -@@ -6827,12 +6822,29 @@ static int napi_poll(struct napi_struct +@@ -6834,12 +6829,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"); -- cgit v1.2.3