diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-18 22:04:51 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-18 22:04:51 +0400 |
| commit | 9d1059c2481885ba7a2af02fc1bf87cae88b302a (patch) | |
| tree | b9ff1d502017ea7939d26a99720801ffdbe2b3da /drivers/net/wireless/iwlwifi/dvm | |
| parent | c4d827c5ccc3a49227dbf9d4b248a2e86f388023 (diff) | |
| parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
| download | linux-9d1059c2481885ba7a2af02fc1bf87cae88b302a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rs.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rxon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c index 94314a8e1029..8fe76dc4f373 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rs.c +++ b/drivers/net/wireless/iwlwifi/dvm/rs.c @@ -2799,7 +2799,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, info->control.rates[0].flags = 0; } info->control.rates[0].idx = rate_idx; - + info->control.rates[0].count = 1; } static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta, diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c index 707446fa00bd..cd1ad0019185 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c @@ -1378,7 +1378,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) struct iwl_chain_noise_data *data = &priv->chain_noise_data; int ret; - if (!(priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED)) + if (priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED) return; if ((data->state == IWL_CHAIN_NOISE_ALIVE) && |