diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:31:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:56:34 -0500 |
| commit | ecdb975c92c6ff63673f6380b87ab1e696dfae38 (patch) | |
| tree | 7e6e401122a46b93e8bc165ca826b0ba406b7d77 /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |
| parent | f8d7c1a18d5e77b17b5cc1ebefa21eaea7f2d0fa (diff) | |
iwlwifi: virtualize nic_config
The nic_config sets uCode dependent register
bits, so it must be virtual in the op_mode.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 16cb4a3511e1..26bb44242090 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
| @@ -816,7 +816,7 @@ static int iwl_nic_init(struct iwl_trans *trans) | |||
| 816 | 816 | ||
| 817 | iwl_set_pwr_vmain(trans); | 817 | iwl_set_pwr_vmain(trans); |
| 818 | 818 | ||
| 819 | iwl_nic_config(priv(trans)); | 819 | iwl_op_mode_nic_config(trans->op_mode); |
| 820 | 820 | ||
| 821 | #ifndef CONFIG_IWLWIFI_IDI | 821 | #ifndef CONFIG_IWLWIFI_IDI |
| 822 | /* Allocate the RX queue, or reset if it is already allocated */ | 822 | /* Allocate the RX queue, or reset if it is already allocated */ |