Page MenuHomeFreeBSD
Files F162623506

D57762.id180483.diff
No OneTemporary
Actions

D57762.id180483.diff
View Options

diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -1817,10 +1817,15 @@
if (c != NULL && c != ni->ni_chan) {
IEEE80211_NOTE(ni->ni_vap,
IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
- "switch station to %s%d channel %u/0x%x",
- IEEE80211_IS_CHAN_VHT(c) ? "VHT" : "HT",
- IEEE80211_IS_CHAN_VHT80(c) ? 80 :
- (IEEE80211_IS_CHAN_HT40(c) ? 40 : 20),
+ "switch station to %s channel %u/0x%x",
+ IEEE80211_IS_CHAN_VHT160(c) ? "VHT160" :
+ IEEE80211_IS_CHAN_VHT80P80(c) ? "VHT80P80" :
+ IEEE80211_IS_CHAN_VHT80(c) ? "VHT80" :
+ IEEE80211_IS_CHAN_VHT40U(c) ? "VHT40U" :
+ IEEE80211_IS_CHAN_VHT40D(c) ? "VHT40D" :
+ IEEE80211_IS_CHAN_VHT20(c) ? "VHT20" :
+ IEEE80211_IS_CHAN_HT40(c) ? "HT40" :
+ "HT20",
c->ic_freq, c->ic_flags);
ni->ni_chan = c;
ret = 1;
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -1938,6 +1938,14 @@
vap->iv_flags&IEEE80211_F_SHSLOT ? "short" : "long",
vap->iv_flags&IEEE80211_F_USEPROT ? ", protection" : "",
ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
+ ni->ni_flags & IEEE80211_NODE_VHT ?
+ (IEEE80211_IS_CHAN_VHT160(ni->ni_chan) ? ", VHT160" :
+ IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan) ? ", VHT80P80" :
+ IEEE80211_IS_CHAN_VHT80(ni->ni_chan) ? ", VHT80" :
+ IEEE80211_IS_CHAN_VHT40U(ni->ni_chan) ? ", VHT40U" :
+ IEEE80211_IS_CHAN_VHT40D(ni->ni_chan) ? ", VHT40D" :
+ IEEE80211_IS_CHAN_VHT20(ni->ni_chan) ? ", VHT20" :
+ "") :
ni->ni_flags & IEEE80211_NODE_HT ?
(ni->ni_chw == NET80211_STA_RX_BW_40 ? ", HT40" : ", HT20") : "",
ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 4:54 AM (1 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35124691
Default Alt Text
D57762.id180483.diff (1 KB)

Event Timeline