From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jun 2012 18:39:53 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=133189a46c2c522eb4ef26b1ede63dd0a9fdc920;p=~shefty%2Frdma-dev.git

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
---

133189a46c2c522eb4ef26b1ede63dd0a9fdc920
diff --cc net/mac80211/mlme.c
index 079038d26a1,2b450f54199..8149a37c93e
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -3100,9 -3100,9 +3100,9 @@@ static int ieee80211_prep_connection(st
  	}
  
  	local->oper_channel = cbss->channel;
 -	ieee80211_hw_config(local, 0);
 +	ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
  
- 	if (!have_sta) {
+ 	if (sta) {
  		u32 rates = 0, basic_rates = 0;
  		bool have_higher_than_11mbit;
  		int min_rate = INT_MAX, min_rate_index = -1;