kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ifconfig: make -vht work

Browse source 
Also hide the other vht options on -vht and only show vht40/80/160/80p80
when vht is enabled.

While here fix some whitespace and comments.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Reviewed by:	adrian, emaste
Differential Revision: https://reviews.freebsd.org/D48326
This commit is contained in:
Bjoern A. Zeeb 2025-01-04 16:58:49 +00:00
parent 07f6575585
commit 42410c6d68
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sbin/ifconfig/ifieee80211.c
View file

@ -198,8 +198,10 @@ static int gottxparams = 0;
static struct ieee80211_channel curchan;
static int gotcurchan = 0;
static struct ifmediareq *global_ifmr;
/* HT */
static int htconf = 0;
static int gothtconf = 0;
static int gothtconf = 0;
static void
gethtconf(if_ctx *ctx)
@ -213,7 +215,7 @@ gethtconf(if_ctx *ctx)
/* VHT */
static int vhtconf = 0;
static int gotvhtconf = 0;
static int gotvhtconf = 0;
static void
getvhtconf(if_ctx *ctx)
@ -5416,26 +5418,27 @@ end:
if (IEEE80211_IS_CHAN_VHT(c) || verbose) {
getvhtconf(ctx);
if (vhtconf & IEEE80211_FVHT_VHT)
if (vhtconf & IEEE80211_FVHT_VHT) {
LINE_CHECK("vht");
else
if (vhtconf & IEEE80211_FVHT_USEVHT40)
LINE_CHECK("vht40");
else
LINE_CHECK("-vht40");
if (vhtconf & IEEE80211_FVHT_USEVHT80)
LINE_CHECK("vht80");
else
LINE_CHECK("-vht80");
if (vhtconf & IEEE80211_FVHT_USEVHT160)
LINE_CHECK("vht160");
else
LINE_CHECK("-vht160");
if (vhtconf & IEEE80211_FVHT_USEVHT80P80)
LINE_CHECK("vht80p80");
else
LINE_CHECK("-vht80p80");
} else if (verbose)
LINE_CHECK("-vht");
if (vhtconf & IEEE80211_FVHT_USEVHT40)
LINE_CHECK("vht40");
else
LINE_CHECK("-vht40");
if (vhtconf & IEEE80211_FVHT_USEVHT80)
LINE_CHECK("vht80");
else
LINE_CHECK("-vht80");
if (vhtconf & IEEE80211_FVHT_USEVHT160)
LINE_CHECK("vht160");
else
LINE_CHECK("-vht160");
if (vhtconf & IEEE80211_FVHT_USEVHT80P80)
LINE_CHECK("vht80p80");
else
LINE_CHECK("-vht80p80");
}
if (get80211val(ctx, IEEE80211_IOC_WME, &wme) != -1) {
@ -6029,7 +6032,7 @@ static struct cmd ieee80211_cmds[] = {
DEF_CMD("ht", 3, set80211htconf), /* NB: 20+40 */
DEF_CMD("-ht", 0, set80211htconf),
DEF_CMD("vht", IEEE80211_FVHT_VHT, set80211vhtconf),
DEF_CMD("-vht", 0, set80211vhtconf),
DEF_CMD("-vht", -IEEE80211_FVHT_VHT, set80211vhtconf),
DEF_CMD("vht40", IEEE80211_FVHT_USEVHT40, set80211vhtconf),
DEF_CMD("-vht40", -IEEE80211_FVHT_USEVHT40, set80211vhtconf),
DEF_CMD("vht80", IEEE80211_FVHT_USEVHT80, set80211vhtconf),