diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:09:59 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:11:13 -0400 |
| commit | a59f975a78f0606a3a364939dfa9b949d5f87521 (patch) | |
| tree | 42ef7708cdec5263026a5e1e84d960d6ba20844f /net/mac80211/mlme.c | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
| parent | 6aee4ca3d2217d3f76469e5ed576d62695f0912a (diff) | |
| download | blackbird-op-linux-a59f975a78f0606a3a364939dfa9b949d5f87521.tar.gz blackbird-op-linux-a59f975a78f0606a3a364939dfa9b949d5f87521.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 0f45d02e0ba7..d7134c170336 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3100,7 +3100,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, } local->oper_channel = cbss->channel; - ieee80211_hw_config(local, 0); + ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); if (!have_sta) { u32 rates = 0, basic_rates = 0; |
