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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
index 079038d26a1433848853a5d8aca17d3e5a741145,2b450f541993ca3cfbb19ea526eb489d531365f6..8149a37c93ee974b6c210073a3b2234053267eae
--- 1/net/mac80211/mlme.c
--- 2/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;