diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
| commit | 1d7d969dd0b467ba32cf3829e8bf104a5084150d (patch) | |
| tree | f0de3aca8a33bed612ba2c09f61fcabe289dc14d /net/mac80211/mlme.c | |
| parent | wireless: rt2x00: rt2800usb: be in sync with latest windows drivers. (diff) | |
| parent | iwlwifi: greenfield support only true for 11n devices (diff) | |
| download | linux-dev-1d7d969dd0b467ba32cf3829e8bf104a5084150d.tar.xz linux-dev-1d7d969dd0b467ba32cf3829e8bf104a5084150d.zip | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2d1a2bef366d..17cb8ae912bc 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -174,6 +174,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, ht_changed = conf_is_ht(&local->hw.conf) != enable_ht || channel_type != local->hw.conf.channel_type; + if (local->tmp_channel) + local->tmp_channel_type = channel_type; local->oper_channel_type = channel_type; if (ht_changed) { |