diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:05:42 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:05:42 -0500 |
| commit | 0971f7d991f051b4f146e61363ee855adc9b31c2 (patch) | |
| tree | e825711effd11b63bccadaabb4df6d5be2698de3 /drivers/net/wireless/iwlwifi/mvm/utils.c | |
| parent | db18014f65f62879e70be55898be3fd68a3363a8 (diff) | |
| parent | 82b715c211a53e80a1db83b9b71995a05fe32908 (diff) | |
| download | op-kernel-dev-0971f7d991f051b4f146e61363ee855adc9b31c2.zip op-kernel-dev-0971f7d991f051b4f146e61363ee855adc9b31c2.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/utils.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c index 1493f79..bbfe529 100644 --- a/drivers/net/wireless/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/iwlwifi/mvm/utils.c @@ -289,8 +289,8 @@ u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx) return last_idx; } -static struct { - char *name; +static const struct { + const char *name; u8 num; } advanced_lookup[] = { { "NMI_INTERRUPT_WDG", 0x34 }, @@ -589,7 +589,7 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, lockdep_assert_held(&mvm->mutex); /* SMPS is irrelevant for NICs that don't have at least 2 RX antenna */ - if (num_of_ant(iwl_fw_valid_rx_ant(mvm->fw)) == 1) + if (num_of_ant(mvm->fw->valid_rx_ant) == 1) return; if (vif->type == NL80211_IFTYPE_AP) |
