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 --- CC: vinicius.gomes@intel.com CC: jhs@mojatatu.com CC: jiri@resnulli.us --- net/sched/sch_cbs.c | 2 +- net/sched/sch_taprio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c index 85b41ffc63ff..1c93469c56e3 100644 --- a/net/sched/sch_cbs.c +++ b/net/sched/sch_cbs.c @@ -340,7 +340,7 @@ static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q) 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, diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index e83cbce62a54..558987d9b977 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -1321,7 +1321,7 @@ static void taprio_set_picos_per_byte(struct net_device *dev, 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, -- 2.54.0