iwlwifi: move iwl_set_rate to iwl-agn-rxon.c
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Wed, 14 Mar 2012 00:16:07 +0000 (17:16 -0700)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 12 Apr 2012 21:21:58 +0000 (14:21 -0700)
Move this as part of  iwl-core.c cleanup.

Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h

index 994fb21a0a8789b93bbc075f91a09851d26d86da..18776ab441482b9a2bd3f068cb61b773cc67077d 100644 (file)
@@ -715,6 +715,19 @@ void iwl_set_flags_for_band(struct iwl_priv *priv,
        }
 }
 
+void iwl_set_rate(struct iwl_priv *priv)
+{
+       struct iwl_rxon_context *ctx;
+
+       for_each_context(priv, ctx) {
+               ctx->staging.cck_basic_rates =
+                   (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
+
+               ctx->staging.ofdm_basic_rates =
+                  (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
+       }
+}
+
 static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv,
                                  struct iwl_rxon_context *ctx, int hw_decrypt)
 {
index 8f9ea33e950eab5d80bcd220ae83ed7923726fbe..3588d3c0d51cbcccde6676d7723866b8d432f767 100644 (file)
@@ -136,6 +136,8 @@ void iwl_set_flags_for_band(struct iwl_priv *priv,
                            struct iwl_rxon_context *ctx,
                            enum ieee80211_band band,
                            struct ieee80211_vif *vif);
+void iwl_set_rate(struct iwl_priv *priv);
+
 /* uCode */
 int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
 void iwl_send_prio_tbl(struct iwl_priv *priv);
index 942cbdbfa0218a1c65436d23f6a6284e318fb897..40eb91a6a83bf5f669f949310ce76dacb4f6273d 100644 (file)
 
 const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
-void iwl_set_rate(struct iwl_priv *priv)
-{
-       struct iwl_rxon_context *ctx;
-
-       for_each_context(priv, ctx) {
-               ctx->staging.cck_basic_rates =
-                   (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-               ctx->staging.ofdm_basic_rates =
-                  (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-       }
-}
-
 void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
 {
        /*
index 8f6b16b80d9abc06317ad7240c44b73b203c7b68..9cf1a9448dc7bac80dfd7e98daa112bbcb872fb6 100644 (file)
@@ -78,7 +78,6 @@ struct iwl_cmd;
  *   L i b                 *
  ***************************/
 
-void iwl_set_rate(struct iwl_priv *priv);
 int iwl_cmd_echo_test(struct iwl_priv *priv);
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 int iwl_alloc_traffic_mem(struct iwl_priv *priv);