From 16ee478f132580fc8f1a7df88d421bad73acb3b8 Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 26 Apr 2016 01:29:03 +0000 Subject: [net80211] add STBC capability flags to iv_flags_ht. This is in preparation for exposing configuring STBC flags up to ifconfig so STBC TX/RX can be configured at runtime. * Set the FHT_STBC flags for TX/RX if the HT capabilitiex exist * Clear the RX STBC HT capability flag when creating a HTCAP IE, so we only announce it if it's configured in the FHT flags. Tested: * AR9331 (carambola2), AP/STA modes --- sys/net80211/ieee80211_ht.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sys/net80211') diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index c4f61fe..d33b5c4 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -293,6 +293,11 @@ ieee80211_ht_vattach(struct ieee80211vap *vap) vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_RX; if (vap->iv_htcaps & IEEE80211_HTC_AMSDU) vap->iv_flags_ht |= IEEE80211_FHT_AMSDU_TX; + + if (vap->iv_htcaps & IEEE80211_HTCAP_TXSTBC) + vap->iv_flags_ht |= IEEE80211_FHT_STBC_TX; + if (vap->iv_htcaps & IEEE80211_HTCAP_RXSTBC) + vap->iv_flags_ht |= IEEE80211_FHT_STBC_RX; } /* NB: disable default legacy WDS, too many issues right now */ if (vap->iv_flags_ext & IEEE80211_FEXT_WDSLEGACY) @@ -2778,6 +2783,13 @@ ieee80211_add_htcap_body(uint8_t *frm, struct ieee80211_node *ni) if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) == 0 || (caps & IEEE80211_HTCAP_CHWIDTH40) == 0) caps &= ~IEEE80211_HTCAP_SHORTGI40; + + /* adjust STBC based on receive capabilities */ + if ((vap->iv_flags_ht & IEEE80211_FHT_STBC_RX) == 0) + caps &= ~IEEE80211_HTCAP_RXSTBC; + + /* XXX TODO: adjust LDPC based on receive capabilities */ + ADDSHORT(frm, caps); /* HT parameters */ -- cgit v1.1