Commit 6aee4ca3 authored Jun 07, 2012 by Stanislaw Gruszka Committed by John W. Linville Jun 08, 2012

mac80211: add back channel change flag



commit 24398e39
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>

parent 58d1eab7

net/mac80211/mlme.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message