From b1c8873e37d4a5cd6c0c2867a763b568b27eaa15 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 17 Nov 2022 21:59:46 +0100 Subject: cli: fix marking the active channel Match by frequency and not by channel as the radio might have the same channel on multiple bands: $ iwinfo radio0 freqlist [snip] * 2.432 GHz (Channel 5) [snip] * 5.975 GHz (Channel 5) [snip] Signed-off-by: Andre Heider --- iwinfo_cli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iwinfo_cli.c b/iwinfo_cli.c index caefac6..6ed60f2 100644 --- a/iwinfo_cli.c +++ b/iwinfo_cli.c @@ -723,7 +723,7 @@ static void print_txpwrlist(const struct iwinfo_ops *iw, const char *ifname) static void print_freqlist(const struct iwinfo_ops *iw, const char *ifname) { - int i, len, ch; + int i, len, freq; char buf[IWINFO_BUFSIZE]; struct iwinfo_freqlist_entry *e; @@ -733,15 +733,15 @@ static void print_freqlist(const struct iwinfo_ops *iw, const char *ifname) return; } - if (iw->channel(ifname, &ch)) - ch = -1; + if (iw->frequency(ifname, &freq)) + freq = -1; for (i = 0; i < len; i += sizeof(struct iwinfo_freqlist_entry)) { e = (struct iwinfo_freqlist_entry *) &buf[i]; printf("%s %s (Channel %s)%s\n", - (ch == e->channel) ? "*" : " ", + (freq == e->mhz) ? "*" : " ", format_frequency(e->mhz), format_channel(e->channel), e->restricted ? " [restricted]" : ""); -- cgit v1.2.1