[openwrt/openwrt] generic: 6.6: refresh patches

LEDE Commits lede-commits at lists.infradead.org
Mon Jun 17 07:03:57 PDT 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e3afc7047be26bb4fd461cc4f068f21cb9622ff0

commit e3afc7047be26bb4fd461cc4f068f21cb9622ff0
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Jun 17 15:02:38 2024 +0100

    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 at makrotopia.org>
---
 .../601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch b/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch
index 3a7962fd88..40e6514264 100644
--- a/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch
+++ b/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch
@@ -250,7 +250,7 @@ Signed-off-by: Paolo Abeni <pabeni at 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 at 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 at 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 at 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;




More information about the lede-commits mailing list