jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 10:52:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MFC r343698, r343700:

Browse Source 
ifconfig(8): display management / multicast wlan(4) rates properly

For 11n / 11ac we are still using non-11n rates for management and
multicast traffic by default; check 'MCS rate' bit to determine how
to print them correctly.

PR:		161035
This commit is contained in:
Andriy Voskoboinyk 2019-02-10 20:42:06 +00:00
parent 5009172724
commit 251ef7900d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=343974
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sbin/ifconfig/ifieee80211.c
View File

@ -3806,6 +3806,21 @@ list_roam(int s)
}
}
/* XXX TODO: rate-to-string method... */
static const char*
get_mcs_mbs_rate_str(uint8_t rate)
{
return (rate & IEEE80211_RATE_MCS) ? "MCS " : "Mb/s";
}
static uint8_t
get_rate_value(uint8_t rate)
{
if (rate & IEEE80211_RATE_MCS)
return (rate &~ IEEE80211_RATE_MCS);
return (rate / 2);
}
static void
list_txparams(int s)
{
@ -3819,19 +3834,23 @@ list_txparams(int s)
continue;
if (mode == IEEE80211_MODE_11NA || mode == IEEE80211_MODE_11NG) {
if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
LINE_CHECK("%-7.7s ucast NONE mgmt %2u MCS "
"mcast %2u MCS maxretry %u",
LINE_CHECK("%-7.7s ucast NONE mgmt %2u %s "
"mcast %2u %s maxretry %u",
modename[mode],
tp->mgmtrate &~ IEEE80211_RATE_MCS,
tp->mcastrate &~ IEEE80211_RATE_MCS,
get_rate_value(tp->mgmtrate),
get_mcs_mbs_rate_str(tp->mgmtrate),
get_rate_value(tp->mcastrate),
get_mcs_mbs_rate_str(tp->mcastrate),
tp->maxretry);
else
LINE_CHECK("%-7.7s ucast %2u MCS mgmt %2u MCS "
"mcast %2u MCS maxretry %u",
LINE_CHECK("%-7.7s ucast %2u MCS mgmt %2u %s "
"mcast %2u %s maxretry %u",
modename[mode],
tp->ucastrate &~ IEEE80211_RATE_MCS,
tp->mgmtrate &~ IEEE80211_RATE_MCS,
tp->mcastrate &~ IEEE80211_RATE_MCS,
get_rate_value(tp->mgmtrate),
get_mcs_mbs_rate_str(tp->mgmtrate),
get_rate_value(tp->mcastrate),
get_mcs_mbs_rate_str(tp->mcastrate),
tp->maxretry);
} else {
if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)