Anyone testing VHT options would wonder about these extra two printfs
by now. Remove them from the tree before I have to do locally again
in another branch.
Sponsored by: The FreeBSD Foundation
Fixes: e9bb7f9aa1b4f
MFC after: 1 week
Differential D48319
ifconfig: remove debug printfs from set80211vhtconf() bz on Sat, Jan 4, 1:56 PM. Authored by
Details Anyone testing VHT options would wonder about these extra two printfs Sponsored by: The FreeBSD Foundation
Diff Detail
Event TimelineComment Actions That /does/ remind me, we should figure out why "ifconfig wlan0 -vht" doesn't work :-) (ifconfig wlan0 -ht and ifconfig wlan0 ht works though!) Comment Actions shot in the dark? diff --git sbin/ifconfig/ifieee80211.c sbin/ifconfig/ifieee80211.c index e9337cf37917..24a6d9180a64 100644 --- sbin/ifconfig/ifieee80211.c +++ sbin/ifconfig/ifieee80211.c @@ -6031,7 +6031,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), Comment Actions It should just disable vht entirely, but it shouldn't need to clear ALL the flags. I'm /pretty/ sure setting -ht doesn't also clear -ht40 greenfield, etc, it just disables being able to negotiate HT to begin with. Comment Actions Well, tricky answer given we do not show [-]ht40 in ifconfig -v; but ifconfig -ht40 does a -ht I thinkn all the 20/40/ht is together if you look at the 6 lines at Comment Actions hm, look at that, those numbers are hilarious. IEEE80211_IOC_HTCONF uses numbers, not flag bits, because of course why not. For ioctl get:
for ioctl set:
So its PRINTING and SETTING in the net80211 ioctl code are different. That's pretty funny. I'm sure it's going to bite us if we do what 11n does - ie, "+vht" enables everything appropriate for the interface, and "-vht" disables it all. As long as -vht clears FHT_VHT and if that's not set, we just don't return / print the other vht flags, we'll be OK. having it disable and re-enable ALL of the flags is going to get very old very quickly during testing. :-) Comment Actions So, yeah, let's land this diff, then go fix +vht / -vht to clear/set FVHT_VHT and verify that does the right thing, without having to set/clear all the flags. I think a good mini project for someone is to turn the HTCONF ioctl bits to actually use defines, not magic numbers. :-) Comment Actions ACK; I'll put the -vht patch up for review -- likely tomorrow at some point as it is 1AM -- and then also look at your reviews. |