add 40mhz intolerant bit testing, 20/40 coexistence still needs a lot…

… of works to do.
OpenIntelWireless · Apr 20, 2021 · 99cab52 · 99cab52
1 parent d171321
commit 99cab52
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/itl80211/openbsd/net80211/ieee80211_proto.c b/itl80211/openbsd/net80211/ieee80211_proto.c
@@ -636,7 +636,10 @@ ieee80211_ht_negotiate(struct ieee80211com *ic, struct ieee80211_node *ni)
         ni->ni_flags |= IEEE80211_NODE_HT_SGI20;
     }
 
-    if (IEEE80211_IS_CHAN_HT40(ni->ni_chan) && (ic->ic_htcaps & IEEE80211_HTCAP_CBW20_40)) {
+    if (((ic->ic_htcaps & IEEE80211_HTCAP_40INTOLERANT) || (ni->ni_htcaps & IEEE80211_HTCAP_40INTOLERANT))
+        && IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
+        ni->ni_chw = 20;
+    } else if (IEEE80211_IS_CHAN_HT40(ni->ni_chan) && (ic->ic_htcaps & IEEE80211_HTCAP_CBW20_40)) {
         ht_param = ni->ni_htop0 & IEEE80211_HTOP0_SCO_MASK;
         if ((ht_param == IEEE80211_HTOP0_SCO_SCA && IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) ||
             (ht_param == IEEE80211_HTOP0_SCO_SCB && IEEE80211_IS_CHAN_HT40D(ni->ni_chan)))  {