diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 11:30:49 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 11:30:49 (GMT) |
| commit | 09e1a79ac03d643960c96314d20a904b39b89a80 (patch) | |
| tree | 8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16 /drivers/net/wireless/iwlwifi/dvm/sta.c | |
| parent | 071d4990fd9fe6fe27b47f1587ba11db3111c3fd (diff) | |
| parent | a87783699b23395c46bbeeb5d28f6db24897bf26 (diff) | |
| download | linux-09e1a79ac03d643960c96314d20a904b39b89a80.tar.xz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index db183b4..c3c13ce 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/drivers/net/wireless/iwlwifi/dvm/sta.c @@ -735,7 +735,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx) memcpy(&lq, priv->stations[i].lq, sizeof(struct iwl_link_quality_cmd)); - if (!memcmp(&lq, &zero_lq, sizeof(lq))) + if (memcmp(&lq, &zero_lq, sizeof(lq))) send_lq = true; } spin_unlock_bh(&priv->sta_lock); |