From: Dylan Eskew Date: Wed, 13 Nov 2024 14:46:08 +0000 (-0800) Subject: wifi: mac80211: ethtool: add monitor channel reporting X-Git-Tag: v6.14-rc1~162^2~181^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f85a3b370e6f1a353cfbbfb5c398590dfeca9d7;p=thirdparty%2Fkernel%2Flinux.git wifi: mac80211: ethtool: add monitor channel reporting When running ethtool on a monitor interface, the channel wasn't reporting properly. This adds logic to properly report the channel for monitor interfaces in ethtool. Signed-off-by: Dylan Eskew Link: https://patch.msgid.link/20241113144608.334060-1-dylan.eskew@candelatech.com Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c index 069aa05139cd4..42f7ee142ce3f 100644 --- a/net/mac80211/ethtool.c +++ b/net/mac80211/ethtool.c @@ -157,6 +157,10 @@ do_survey: chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); if (chanctx_conf) channel = chanctx_conf->def.chan; + else if (local->open_count > 0 && + local->open_count == local->monitors && + sdata->vif.type == NL80211_IFTYPE_MONITOR) + channel = local->monitor_chanreq.oper.chan; else channel = NULL; rcu_read_unlock();