]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: sched: avoid printing uninitialized link speed
authorJakub Kicinski <kuba@kernel.org>
Tue, 9 Jun 2026 18:33:53 +0000 (11:33 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 11 Jun 2026 13:44:55 +0000 (15:44 +0200)
sch_cbs and sch_taprio print ecmd.base.speed, even if
netif_get_link_ksettings() failed. When netif_get_link_ksettings()
fails the ecmd may not be initialized.

Use the always-initialized speed variable instead.
The semantics change slightly because UNKNOWN will
never be printed, but that doesn't seem important
enough to complicate the code for.

This is a _dbg() print, anyway.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20260609183353.1109641-1-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/sched/sch_cbs.c
net/sched/sch_taprio.c

index 85b41ffc63ff1435912d1ff9088df8da1dc26ad0..1c93469c56e3d2803feef501b78dbc19f69ae3ae 100644 (file)
@@ -340,7 +340,7 @@ skip:
        atomic64_set(&q->port_rate, port_rate);
        netdev_dbg(dev, "cbs: set %s's port_rate to: %lld, linkspeed: %d\n",
                   dev->name, (long long)atomic64_read(&q->port_rate),
-                  ecmd.base.speed);
+                  speed);
 }
 
 static int cbs_dev_notifier(struct notifier_block *nb, unsigned long event,
index e83cbce62a54a71ccc55b752acb6ce6db442cbd7..558987d9b9770d94509ab18894620fb7e63e21be 100644 (file)
@@ -1321,7 +1321,7 @@ skip:
        atomic64_set(&q->picos_per_byte, picos_per_byte);
        netdev_dbg(dev, "taprio: set %s's picos_per_byte to: %lld, linkspeed: %d\n",
                   dev->name, (long long)atomic64_read(&q->picos_per_byte),
-                  ecmd.base.speed);
+                  speed);
 }
 
 static int taprio_dev_notifier(struct notifier_block *nb, unsigned long event,