Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index ab62c018fcdb..c36fb858a45b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -82,7 +82,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv)
 {
         /* Indicate calibration version to uCode. */
         if (iwl_eeprom_calib_version(priv->shrd) >= 6)
-                iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
+                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
                                 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
 }
 
@@ -90,9 +90,9 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv)
 {
         /* Indicate calibration version to uCode. */
         if (iwl_eeprom_calib_version(priv->shrd) >= 6)
-                iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
+                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
                                 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
-        iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
+        iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
                     CSR_GP_DRIVER_REG_BIT_6050_1x2);
 }
 
@@ -104,7 +104,7 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
         /* no locking required for register write */
         if (cfg(priv)->pa_type == IWL_PA_INTERNAL) {
                 /* 2x2 IPA phy type */
-                iwl_write32(bus(priv), CSR_GP_DRIVER_REG,
+                iwl_write32(trans(priv), CSR_GP_DRIVER_REG,
                              CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
         }
         /* do additional nic configuration if needed */
@@ -145,8 +145,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
                         iwlagn_mod_params.num_of_queues;
 
         hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;
-        priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;
-
         hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;
         hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;