generic: 6.6: refresh patches
authorDaniel Golle <daniel@makrotopia.org>
Mon, 17 Jun 2024 14:02:38 +0000 (15:02 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Mon, 17 Jun 2024 14:03:47 +0000 (15:03 +0100)
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>
target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch

index 3a7962fd88b772ce817f0dcee276e409ce08f999..40e6514264cf2ac90df7fc0fe7180af89dd09227 100644 (file)
@@ -250,7 +250,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        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);
                if (napi->poll == process_backlog)
@@ -259,7 +259,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                else
                        ____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);
        local_irq_enable();
  
@@ -278,7 +278,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        /* Process offline CPU's input_pkt_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
   *       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);
                sd->backlog.poll = process_backlog;
                sd->backlog.weight = weight_p;