mac80211: rewrite HT handling

The HT handling has the following deficiencies, which I've
(partially) fixed:
 * it always uses the AP info even if there is no AP,
   hence has no chance of working as an AP
 * it pretends to be HW config, but really is per-BSS
 * channel sanity checking is left to the drivers
 * it generally lets the driver control too much

HT enabling is still wrong with this patch if you have more than
one virtual STA mode interface, but that never happens currently.
Once WDS, IBSS or AP/VLAN gets HT capabilities, it will also be
wrong, see the comment in ieee80211_enable_ht().

Additionally, this fixes a number of bugs:
 * mac80211: ieee80211_set_disassoc doesn't notify the driver any
             more since the refactoring
 * iwl-agn-rs: always uses the HT capabilities from the wrong stuff
               mac80211 gives it rather than the actual peer STA
 * ath9k: a number of bugs resulting from the broken HT API

I'm not entirely happy with putting the HT capabilities into
struct ieee80211_sta as restricted to our own HT TX capabilities,
but I see no cleaner solution for now.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 20 insertions, 21 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 41cd114c438c..7555c3413384 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -330,25 +330,15 @@ static void ath9k_ht_conf(struct ath_softc *sc,
 {
         struct ath_ht_info *ht_info = &sc->sc_ht_info;
 
-        if (bss_conf->assoc_ht) {
-                ht_info->ext_chan_offset =
-                        bss_conf->ht_bss_conf->bss_cap &
-                                IEEE80211_HT_PARAM_CHA_SEC_OFFSET;
-
-                if (!(bss_conf->ht_cap->cap &
-                        IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
-                            (bss_conf->ht_bss_conf->bss_cap &
-                                IEEE80211_HT_PARAM_CHAN_WIDTH_ANY))
+        if (sc->hw->conf.ht.enabled) {
+                ht_info->ext_chan_offset = bss_conf->ht.secondary_channel_offset;
+
+                if (bss_conf->ht.width_40_ok)
                         ht_info->tx_chan_width = ATH9K_HT_MACMODE_2040;
                 else
                         ht_info->tx_chan_width = ATH9K_HT_MACMODE_20;
 
                 ath9k_hw_set11nmac2040(sc->sc_ah, ht_info->tx_chan_width);
-                ht_info->maxampdu = 1 << (IEEE80211_HTCAP_MAXRXAMPDU_FACTOR +
-                                        bss_conf->ht_cap->ampdu_factor);
-                ht_info->mpdudensity =
-                        parse_mpdudensity(bss_conf->ht_cap->ampdu_density);
-
         }
 }
 
@@ -390,7 +380,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                 sc->sc_halstats.ns_avgtxrate = ATH_RATE_DUMMY_MARKER;
 
                 /* Update chainmask */
-                ath_update_chainmask(sc, bss_conf->assoc_ht);
+                ath_update_chainmask(sc, hw->conf.ht.enabled);
 
                 DPRINTF(sc, ATH_DBG_CONFIG,
                         "%s: bssid %pM aid 0x%x\n",
@@ -408,7 +398,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                         return;
                 }
 
-                if (hw->conf.ht_cap.ht_supported)
+                if (hw->conf.ht.enabled)
                         sc->sc_ah->ah_channels[pos].chanmode =
                                 ath_get_extchanmode(sc, curchan);
                 else
@@ -531,7 +521,6 @@ int _ath_rx_indicate(struct ath_softc *sc,
 
         if (an) {
                 ath_rx_input(sc, an,
-                             hw->conf.ht_cap.ht_supported,
                              skb, status, &st);
         }
         if (!an || (st != ATH_RX_CONSUMED))
@@ -1241,6 +1230,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 __func__,
                 curchan->center_freq);
 
+        /* Update chainmask */
+        ath_update_chainmask(sc, conf->ht.enabled);
+
         pos = ath_get_channel(sc, curchan);
         if (pos == -1) {
                 DPRINTF(sc, ATH_DBG_FATAL, "%s: Invalid channel\n", __func__);
@@ -1251,7 +1243,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 (curchan->band == IEEE80211_BAND_2GHZ) ?
                 CHANNEL_G : CHANNEL_A;
 
-        if (sc->sc_curaid && hw->conf.ht_cap.ht_supported)
+        if (sc->sc_curaid && hw->conf.ht.enabled)
                 sc->sc_ah->ah_channels[pos].chanmode =
                         ath_get_extchanmode(sc, curchan);
 
@@ -1434,6 +1426,14 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
                 } else {
                         ath_node_get(sc, sta->addr);
                 }
+
+                /* XXX: Is this right? Can the capabilities change? */
+                an = ath_node_find(sc, sta->addr);
+                an->maxampdu = 1 << (IEEE80211_HTCAP_MAXRXAMPDU_FACTOR +
+                                        sta->ht_cap.ampdu_factor);
+                an->mpdudensity =
+                        parse_mpdudensity(sta->ht_cap.ampdu_density);
+
                 spin_unlock_irqrestore(&sc->node_lock, flags);
                 break;
         case STA_NOTIFY_REMOVE:
@@ -1552,9 +1552,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_HT) {
-                DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed HT %d\n",
-                        __func__,
-                        bss_conf->assoc_ht);
+                DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed HT\n",
+                        __func__);
                 ath9k_ht_conf(sc, bss_conf);
         }