iwlegacy: remove unused agg_tids_count

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h
index fd792e15fab6539a55710f4b32f2ed6f4e8bb709..62e8cc07f04609ee526c41104ac7b10cf91fb45a 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
@@ -1164,12 +1164,6 @@ struct iwl_priv {
 #endif
 #if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
                struct {
-                       /*
-                        * reporting the number of tids has AGG on. 0 means
-                        * no AGGREGATION
-                        */
-                       u8 agg_tids_count;
-
                        struct iwl_rx_phy_res last_phy_res;
                        bool last_phy_res_valid;
 

diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 98e42a11b71ff7f36dd325b4032607f50a59f9a3..c0ea858d03be755390c7dced4870dc3e7fd1681c 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -2442,20 +2442,10 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
        case IEEE80211_AMPDU_TX_START:
                IWL_DEBUG_HT(priv, "start Tx\n");
                ret = iwl4965_tx_agg_start(priv, vif, sta, tid, ssn);
-               if (ret == 0) {
-                       priv->_4965.agg_tids_count++;
-                       IWL_DEBUG_HT(priv, "priv->_4965.agg_tids_count = %u\n",
-                                    priv->_4965.agg_tids_count);
-               }
                break;
        case IEEE80211_AMPDU_TX_STOP:
                IWL_DEBUG_HT(priv, "stop Tx\n");
                ret = iwl4965_tx_agg_stop(priv, vif, sta, tid);
-               if ((ret == 0) && (priv->_4965.agg_tids_count > 0)) {
-                       priv->_4965.agg_tids_count--;
-                       IWL_DEBUG_HT(priv, "priv->_4965.agg_tids_count = %u\n",
-                                    priv->_4965.agg_tids_count);
-               }
                if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                        ret = 0;
                break;
@@ -2796,7 +2786,6 @@ static int iwl4965_init_drv(struct iwl_priv *priv)
        priv->iw_mode = NL80211_IFTYPE_STATION;
        priv->current_ht_config.smps = IEEE80211_SMPS_STATIC;
        priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;
-       priv->_4965.agg_tids_count = 0;
 
        /* initialize force reset */
        priv->force_reset.reset_duration = IWL_DELAY_NEXT_FORCE_FW_RELOAD;