generic: 6.6: refresh patches

Refresh patches as line numbers changed with newer upstream version
since original backport PR was opened.

Fixes: a5c095c453 ("generic: 6.6: replace (broken) downstream patch with upstream solution")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2024-06-17 15:02:38 +01:00
parent 5f9fb964c3
commit e3afc7047b

View File

@ -250,7 +250,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return 0; return 0;
} }
@@ -11288,7 +11329,7 @@ static int dev_cpu_dead(unsigned int old @@ -11289,7 +11330,7 @@ static int dev_cpu_dead(unsigned int old
list_del_init(&napi->poll_list); list_del_init(&napi->poll_list);
if (napi->poll == process_backlog) if (napi->poll == process_backlog)
@ -259,7 +259,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
else else
____napi_schedule(sd, napi); ____napi_schedule(sd, napi);
} }
@@ -11296,12 +11337,14 @@ static int dev_cpu_dead(unsigned int old @@ -11297,12 +11338,14 @@ static int dev_cpu_dead(unsigned int old
raise_softirq_irqoff(NET_TX_SOFTIRQ); raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable(); local_irq_enable();
@ -278,7 +278,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/* Process offline CPU's input_pkt_queue */ /* Process offline CPU's input_pkt_queue */
while ((skb = __skb_dequeue(&oldsd->process_queue))) { while ((skb = __skb_dequeue(&oldsd->process_queue))) {
@@ -11564,6 +11607,38 @@ static struct pernet_operations __net_in @@ -11565,6 +11608,38 @@ static struct pernet_operations __net_in
* *
*/ */
@ -317,7 +317,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/* /*
* This is called single threaded during boot, so no need * This is called single threaded during boot, so no need
* to take the rtnl semaphore. * to take the rtnl semaphore.
@@ -11614,7 +11689,10 @@ static int __init net_dev_init(void) @@ -11615,7 +11690,10 @@ static int __init net_dev_init(void)
init_gro_hash(&sd->backlog); init_gro_hash(&sd->backlog);
sd->backlog.poll = process_backlog; sd->backlog.poll = process_backlog;
sd->backlog.weight = weight_p; sd->backlog.weight = weight_p;