From efce897a3a46f6b437b295040d00f481dc2b05c9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Feb 2026 17:36:54 +0100 Subject: [PATCH] 6.18-stable patches added patches: net-sched-act_ife-convert-comma-to-semicolon.patch --- ...d-act_ife-convert-comma-to-semicolon.patch | 44 +++++++++++++++++++ queue-6.18/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-6.18/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 index 0000000000..4a78b18635 --- /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 +Date: Wed, 12 Nov 2025 15:27:09 +0800 +Subject: net/sched: act_ife: convert comma to semicolon + +From: Chen Ni + +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 +Reviewed-by: Jamal Hadi Salim +Link: https://patch.msgid.link/20251112072709.73755-1-nichen@iscas.ac.cn +Signed-off-by: Jakub Kicinski +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + 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 e40ed227b5..7c303218a4 100644 --- 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 -- 2.47.3