diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
commit | 4144cb2ade46d97b9c41682fd2e9064a59f23a98 (patch) | |
tree | 4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc /drivers/net/wireless/iwlwifi/iwl-scan.c | |
parent | 59f608d84f937cb5e2fd3a0b9f848f200d47ba85 (diff) | |
parent | 604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 084aa2c4ccf..a6454726737 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -569,7 +569,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) struct iwl_scan_cmd *scan; struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; u32 rate_flags = 0; - u16 cmd_len; + u16 cmd_len = 0; u16 rx_chain = 0; enum ieee80211_band band; u8 n_probes = 0; |