6.18-stable patches

added patches:
	net-sched-act_ife-convert-comma-to-semicolon.patch

diff --git a/queue-6.18/net-sched-act_ife-convert-comma-to-semicolon.patch b/queue-6.18/net-sched-act_ife-convert-comma-to-semicolon.patch
new file mode 100644 (file)
index 0000000..4a78b18
--- /dev/null
+++ b/queue-6.18/net-sched-act_ife-convert-comma-to-semicolon.patch
@@ -0,0 +1,44 @@
+From 205305c028ad986d0649b8b100bab6032dcd1bb5 Mon Sep 17 00:00:00 2001
+From: Chen Ni <nichen@iscas.ac.cn>
+Date: Wed, 12 Nov 2025 15:27:09 +0800
+Subject: net/sched: act_ife: convert comma to semicolon
+
+From: Chen Ni <nichen@iscas.ac.cn>
+
+commit 205305c028ad986d0649b8b100bab6032dcd1bb5 upstream.
+
+Replace comma between expressions with semicolons.
+
+Using a ',' in place of a ';' can have unintended side effects.
+Although that is not the case here, it is seems best to use ';'
+unless ',' is intended.
+
+Found by inspection.
+No functional change intended.
+Compile tested only.
+
+Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
+Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
+Link: https://patch.msgid.link/20251112072709.73755-1-nichen@iscas.ac.cn
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/act_ife.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/net/sched/act_ife.c
++++ b/net/sched/act_ife.c
+@@ -649,9 +649,9 @@ static int tcf_ife_dump(struct sk_buff *
+ 
+       memset(&opt, 0, sizeof(opt));
+ 
+-      opt.index = ife->tcf_index,
+-      opt.refcnt = refcount_read(&ife->tcf_refcnt) - ref,
+-      opt.bindcnt = atomic_read(&ife->tcf_bindcnt) - bind,
++      opt.index = ife->tcf_index;
++      opt.refcnt = refcount_read(&ife->tcf_refcnt) - ref;
++      opt.bindcnt = atomic_read(&ife->tcf_bindcnt) - bind;
+ 
+       spin_lock_bh(&ife->tcf_lock);
+       opt.action = ife->tcf_action;

diff --git a/queue-6.18/series b/queue-6.18/series
index e40ed227b5264559becf183f957e36d1ac73c50a..7c303218a4d40c0352c92a44caec86713d78e603 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -116,3 +116,4 @@ iommu-tegra241-cmdqv-reset-vcmdq-in-tegra241_vcmdq_hw_init_user.patch
 gpiolib-acpi-fix-potential-out-of-boundary-left-shift.patch
 libbpf-fix-wdiscarded-qualifiers-under-c23.patch
 revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch
+net-sched-act_ife-convert-comma-to-semicolon.patch