iwl3945: Getting rid of the *39_rxon iwl_priv fields

The iwl_rxon_cmd is really just a iwl3945_rxon_cmd structure extension.
So, we can use the *_rxon fields from iwl_priv instead of the 3945 specific
ones (*39_rxon). We have to then be careful when submitting REPLY_RXON host
commands, since the command length as to be set according to the HW. As
another precaution the reserved4 and reserved5 fields are cleared before being
sent to the 3945.

With the *39_rxon removal, a lot of duplicated code can be removed from the
3945 code base.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 355 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 6b7120a41ab2..c54a9bcbb2e1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -94,66 +94,6 @@ MODULE_ALIAS("iwl4965");
 
 /**************************************************************/
 
-
-
-static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
-{
-        struct iwl_rxon_cmd *rxon = &priv->staging_rxon;
-
-        if (hw_decrypt)
-                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
-        else
-                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
-
-}
-
-/**
- * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
- * @priv: staging_rxon is compared to active_rxon
- *
- * If the RXON structure is changing enough to require a new tune,
- * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
- * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
- */
-static int iwl_full_rxon_required(struct iwl_priv *priv)
-{
-
-        /* These items are only settable from the full RXON command */
-        if (!(iwl_is_associated(priv)) ||
-            compare_ether_addr(priv->staging_rxon.bssid_addr,
-                               priv->active_rxon.bssid_addr) ||
-            compare_ether_addr(priv->staging_rxon.node_addr,
-                               priv->active_rxon.node_addr) ||
-            compare_ether_addr(priv->staging_rxon.wlap_bssid_addr,
-                               priv->active_rxon.wlap_bssid_addr) ||
-            (priv->staging_rxon.dev_type != priv->active_rxon.dev_type) ||
-            (priv->staging_rxon.channel != priv->active_rxon.channel) ||
-            (priv->staging_rxon.air_propagation !=
-             priv->active_rxon.air_propagation) ||
-            (priv->staging_rxon.ofdm_ht_single_stream_basic_rates !=
-             priv->active_rxon.ofdm_ht_single_stream_basic_rates) ||
-            (priv->staging_rxon.ofdm_ht_dual_stream_basic_rates !=
-             priv->active_rxon.ofdm_ht_dual_stream_basic_rates) ||
-            (priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id))
-                return 1;
-
-        /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
-         * be updated with the RXON_ASSOC command -- however only some
-         * flag transitions are allowed using RXON_ASSOC */
-
-        /* Check if we are not switching bands */
-        if ((priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) !=
-            (priv->active_rxon.flags & RXON_FLG_BAND_24G_MSK))
-                return 1;
-
-        /* Check if we are switching association toggle */
-        if ((priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) !=
-                (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK))
-                return 1;
-
-        return 0;
-}
-
 /**
  * iwl_commit_rxon - commit staging_rxon to hardware
  *
@@ -179,7 +119,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
          * 5000, but will not damage 4965 */
         priv->staging_rxon.flags |= RXON_FLG_SELF_CTS_EN;
 
-        ret = iwl_agn_check_rxon_cmd(priv);
+        ret = iwl_check_rxon_cmd(priv);
         if (ret) {
                 IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");
                 return -EINVAL;
@@ -374,31 +314,6 @@ static unsigned int iwl_fill_beacon_frame(struct iwl_priv *priv,
         return priv->ibss_beacon->len;
 }
 
-static u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv)
-{
-        int i;
-        int rate_mask;
-
-        /* Set rate mask*/
-        if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK)
-                rate_mask = priv->active_rate_basic & IWL_CCK_RATES_MASK;
-        else
-                rate_mask = priv->active_rate_basic & IWL_OFDM_RATES_MASK;
-
-        /* Find lowest valid rate */
-        for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID;
-                                        i = iwl_rates[i].next_ieee) {
-                if (rate_mask & (1 << i))
-                        return iwl_rates[i].plcp;
-        }
-
-        /* No valid rate was found. Assign the lowest one */
-        if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK)
-                return IWL_RATE_1M_PLCP;
-        else
-                return IWL_RATE_6M_PLCP;
-}
-
 static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
                                        struct iwl_frame *frame, u8 rate)
 {
@@ -771,111 +686,10 @@ static void iwl_setup_rxon_timing(struct iwl_priv *priv)
                         le16_to_cpu(priv->rxon_timing.atim_window));
 }
 
-static void iwl_set_flags_for_band(struct iwl_priv *priv,
-                                   enum ieee80211_band band)
-{
-        if (band == IEEE80211_BAND_5GHZ) {
-                priv->staging_rxon.flags &=
-                    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
-                      | RXON_FLG_CCK_MSK);
-                priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
-        } else {
-                /* Copied from iwl_post_associate() */
-                if (priv->assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
-                        priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
-                else
-                        priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                if (priv->iw_mode == NL80211_IFTYPE_ADHOC)
-                        priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
-                priv->staging_rxon.flags |= RXON_FLG_AUTO_DETECT_MSK;
-                priv->staging_rxon.flags &= ~RXON_FLG_CCK_MSK;
-        }
-}
-
-/*
- * initialize rxon structure with default values from eeprom
- */
-static void iwl_connection_init_rx_config(struct iwl_priv *priv, int mode)
-{
-        const struct iwl_channel_info *ch_info;
-
-        memset(&priv->staging_rxon, 0, sizeof(priv->staging_rxon));
-
-        switch (mode) {
-        case NL80211_IFTYPE_AP:
-                priv->staging_rxon.dev_type = RXON_DEV_TYPE_AP;
-                break;
-
-        case NL80211_IFTYPE_STATION:
-                priv->staging_rxon.dev_type = RXON_DEV_TYPE_ESS;
-                priv->staging_rxon.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        case NL80211_IFTYPE_ADHOC:
-                priv->staging_rxon.dev_type = RXON_DEV_TYPE_IBSS;
-                priv->staging_rxon.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
-                priv->staging_rxon.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
-                                                  RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        case NL80211_IFTYPE_MONITOR:
-                priv->staging_rxon.dev_type = RXON_DEV_TYPE_SNIFFER;
-                priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
-                    RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-        default:
-                IWL_ERR(priv, "Unsupported interface type %d\n", mode);
-                break;
-        }
-
-#if 0
-        /* TODO:  Figure out when short_preamble would be set and cache from
-         * that */
-        if (!hw_to_local(priv->hw)->short_preamble)
-                priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-        else
-                priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-#endif
-
-        ch_info = iwl_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(priv->active_rxon.channel));
-
-        if (!ch_info)
-                ch_info = &priv->channel_info[0];
-
-        /*
-         * in some case A channels are all non IBSS
-         * in this case force B/G channel
-         */
-        if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&
-            !(is_channel_ibss(ch_info)))
-                ch_info = &priv->channel_info[0];
-
-        priv->staging_rxon.channel = cpu_to_le16(ch_info->channel);
-        priv->band = ch_info->band;
-
-        iwl_set_flags_for_band(priv, priv->band);
-
-        priv->staging_rxon.ofdm_basic_rates =
-            (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-        priv->staging_rxon.cck_basic_rates =
-            (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-        priv->staging_rxon.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED_MSK |
-                                        RXON_FLG_CHANNEL_MODE_PURE_40_MSK);
-        memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
-        memcpy(priv->staging_rxon.wlap_bssid_addr, priv->mac_addr, ETH_ALEN);
-        priv->staging_rxon.ofdm_ht_single_stream_basic_rates = 0xff;
-        priv->staging_rxon.ofdm_ht_dual_stream_basic_rates = 0xff;
-        iwl_set_rxon_chain(priv);
-}
-
 static int iwl_set_mode(struct iwl_priv *priv, int mode)
 {
         iwl_connection_init_rx_config(priv, mode);
+        iwl_set_rxon_chain(priv);
         memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
 
         iwl_clear_stations_table(priv);
@@ -896,54 +710,6 @@ static int iwl_set_mode(struct iwl_priv *priv, int mode)
         return 0;
 }
 
-static void iwl_set_rate(struct iwl_priv *priv)
-{
-        const struct ieee80211_supported_band *hw = NULL;
-        struct ieee80211_rate *rate;
-        int i;
-
-        hw = iwl_get_hw_mode(priv, priv->band);
-        if (!hw) {
-                IWL_ERR(priv, "Failed to set rate: unable to get hw mode\n");
-                return;
-        }
-
-        priv->active_rate = 0;
-        priv->active_rate_basic = 0;
-
-        for (i = 0; i < hw->n_bitrates; i++) {
-                rate = &(hw->bitrates[i]);
-                if (rate->hw_value < IWL_RATE_COUNT)
-                        priv->active_rate |= (1 << rate->hw_value);
-        }
-
-        IWL_DEBUG_RATE("Set active_rate = %0x, active_rate_basic = %0x\n",
-                       priv->active_rate, priv->active_rate_basic);
-
-        /*
-         * If a basic rate is configured, then use it (adding IWL_RATE_1M_MASK)
-         * otherwise set it to the default of all CCK rates and 6, 12, 24 for
-         * OFDM
-         */
-        if (priv->active_rate_basic & IWL_CCK_BASIC_RATES_MASK)
-                priv->staging_rxon.cck_basic_rates =
-                    ((priv->active_rate_basic &
-                      IWL_CCK_RATES_MASK) >> IWL_FIRST_CCK_RATE) & 0xF;
-        else
-                priv->staging_rxon.cck_basic_rates =
-                    (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-        if (priv->active_rate_basic & IWL_OFDM_BASIC_RATES_MASK)
-                priv->staging_rxon.ofdm_basic_rates =
-                    ((priv->active_rate_basic &
-                      (IWL_OFDM_BASIC_RATES_MASK | IWL_RATE_6M_MASK)) >>
-                      IWL_FIRST_OFDM_RATE) & 0xFF;
-        else
-                priv->staging_rxon.ofdm_basic_rates =
-                   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-}
-
-
 /******************************************************************************
  *
  * Generic RX handler implementations
@@ -999,19 +765,6 @@ static void iwl_rx_reply_error(struct iwl_priv *priv,
                 le32_to_cpu(pkt->u.err_resp.error_info));
 }
 
-#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x
-
-static void iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
-        struct iwl_rxon_cmd *rxon = (void *)&priv->active_rxon;
-        struct iwl_csa_notification *csa = &(pkt->u.csa_notif);
-        IWL_DEBUG_11H("CSA notif: channel %d, status %d\n",
-                      le16_to_cpu(csa->channel), le32_to_cpu(csa->status));
-        rxon->channel = csa->channel;
-        priv->staging_rxon.channel = csa->channel;
-}
-
 static void iwl_rx_pm_sleep_notif(struct iwl_priv *priv,
                                       struct iwl_rx_mem_buffer *rxb)
 {
@@ -1370,27 +1123,6 @@ void iwl_rx_handle(struct iwl_priv *priv)
         iwl_rx_queue_restock(priv);
 }
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-static void iwl_print_rx_config_cmd(struct iwl_priv *priv)
-{
-        struct iwl_rxon_cmd *rxon = &priv->staging_rxon;
-
-        IWL_DEBUG_RADIO("RX CONFIG:\n");
-        iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
-        IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
-        IWL_DEBUG_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
-        IWL_DEBUG_RADIO("u32 filter_flags: 0x%08x\n",
-                        le32_to_cpu(rxon->filter_flags));
-        IWL_DEBUG_RADIO("u8 dev_type: 0x%x\n", rxon->dev_type);
-        IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
-                        rxon->ofdm_basic_rates);
-        IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
-        IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
-}
-#endif
-
 /* call this function to flush any scheduled tasklet */
 static inline void iwl_synchronize_irq(struct iwl_priv *priv)
 {
@@ -1399,45 +1131,6 @@ static inline void iwl_synchronize_irq(struct iwl_priv *priv)
         tasklet_kill(&priv->irq_tasklet);
 }
 
-/**
- * iwl_irq_handle_error - called for HW or SW error interrupt from card
- */
-static void iwl_irq_handle_error(struct iwl_priv *priv)
-{
-        /* Set the FW error flag -- cleared on iwl_down */
-        set_bit(STATUS_FW_ERROR, &priv->status);
-
-        /* Cancel currently queued command. */
-        clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        if (priv->debug_level & IWL_DL_FW_ERRORS) {
-                iwl_dump_nic_error_log(priv);
-                iwl_dump_nic_event_log(priv);
-                iwl_print_rx_config_cmd(priv);
-        }
-#endif
-
-        wake_up_interruptible(&priv->wait_command_queue);
-
-        /* Keep the restart process from trying to send host
-         * commands by clearing the INIT status bit */
-        clear_bit(STATUS_READY, &priv->status);
-
-        if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                IWL_DEBUG(IWL_DL_FW_ERRORS,
-                          "Restarting adapter due to uCode error.\n");
-
-                if (iwl_is_associated(priv)) {
-                        memcpy(&priv->recovery_rxon, &priv->active_rxon,
-                               sizeof(priv->recovery_rxon));
-                        priv->error_recovering = 1;
-                }
-                if (priv->cfg->mod_params->restart_fw)
-                        queue_work(priv->workqueue, &priv->restart);
-        }
-}
-
 static void iwl_error_recovery(struct iwl_priv *priv)
 {
         unsigned long flags;
@@ -2010,6 +1703,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
         } else {
                 /* Initialize our rx_config data */
                 iwl_connection_init_rx_config(priv, priv->iw_mode);
+                iwl_set_rxon_chain(priv);
                 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
         }
 
@@ -2899,52 +2593,6 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw,
         return 0;
 }
 
-static void iwl_configure_filter(struct ieee80211_hw *hw,
-                                 unsigned int changed_flags,
-                                 unsigned int *total_flags,
-                                 int mc_count, struct dev_addr_list *mc_list)
-{
-        struct iwl_priv *priv = hw->priv;
-        __le32 *filter_flags = &priv->staging_rxon.filter_flags;
-
-        IWL_DEBUG_MAC80211("Enter: changed: 0x%x, total: 0x%x\n",
-                        changed_flags, *total_flags);
-
-        if (changed_flags & (FIF_OTHER_BSS | FIF_PROMISC_IN_BSS)) {
-                if (*total_flags & (FIF_OTHER_BSS | FIF_PROMISC_IN_BSS))
-                        *filter_flags |= RXON_FILTER_PROMISC_MSK;
-                else
-                        *filter_flags &= ~RXON_FILTER_PROMISC_MSK;
-        }
-        if (changed_flags & FIF_ALLMULTI) {
-                if (*total_flags & FIF_ALLMULTI)
-                        *filter_flags |= RXON_FILTER_ACCEPT_GRP_MSK;
-                else
-                        *filter_flags &= ~RXON_FILTER_ACCEPT_GRP_MSK;
-        }
-        if (changed_flags & FIF_CONTROL) {
-                if (*total_flags & FIF_CONTROL)
-                        *filter_flags |= RXON_FILTER_CTL2HOST_MSK;
-                else
-                        *filter_flags &= ~RXON_FILTER_CTL2HOST_MSK;
-        }
-        if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-                if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
-                        *filter_flags |= RXON_FILTER_BCON_AWARE_MSK;
-                else
-                        *filter_flags &= ~RXON_FILTER_BCON_AWARE_MSK;
-        }
-
-        /* We avoid iwl_commit_rxon here to commit the new filter flags
-         * since mac80211 will call ieee80211_hw_config immediately.
-         * (mc_list is not supported at this time). Otherwise, we need to
-         * queue a background iwl_commit_rxon work.
-         */
-
-        *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
-                        FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
-}
-
 static void iwl_mac_remove_interface(struct ieee80211_hw *hw,
                                      struct ieee80211_if_init_conf *conf)
 {