diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-06-07 14:47:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-08 19:47:08 +0200 |
| commit | 6aee4ca3d2217d3f76469e5ed576d62695f0912a (patch) | |
| tree | 60f9e2b3c872dc91fbff1a053edcf83d69a4cfcf /net | |
| parent | NFC: Fix possible NULL ptr deref when getting the name of a socket (diff) | |
| download | linux-6aee4ca3d2217d3f76469e5ed576d62695f0912a.tar.xz linux-6aee4ca3d2217d3f76469e5ed576d62695f0912a.zip | |
mac80211: add back channel change flag
commit 24398e39c8ee4a9d9123eed322b859ece4d16cac
Author: Johannes Berg <johannes.berg@intel.com>
Date: Wed Mar 28 10:58:36 2012 +0200
mac80211: set HT channel before association
removed IEEE80211_CONF_CHANGE_CHANNEL argument from ieee80211_hw_config,
which is required by iwl4965 driver, otherwise that driver does not
configure channel properly and is not able to associate.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -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 d94627c2929c..91d84cc77bbf 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3124,7 +3124,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; |