From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 9 Jul 2012 20:34:34 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.6-rc1~125^2~57^2~209
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2;p=linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	net/mac80211/mlme.c
---

635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2
diff --cc net/mac80211/mlme.c
index f1a80da4e56a,0db5d34a06b6..aa69a331f374
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2149,19 -2170,17 +2148,17 @@@ ieee80211_rx_mgmt_assoc_resp(struct iee
  	*bss = assoc_data->bss;
  
  	if (status_code != WLAN_STATUS_SUCCESS) {
 -		printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
 -		       sdata->name, mgmt->sa, status_code);
 +		sdata_info(sdata, "%pM denied association (code=%d)\n",
 +			   mgmt->sa, status_code);
  		ieee80211_destroy_assoc_data(sdata, false);
  	} else {
- 		sdata_info(sdata, "associated\n");
- 
  		if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
  			/* oops -- internal error -- send timeout for now */
- 			ieee80211_destroy_assoc_data(sdata, true);
- 			sta_info_destroy_addr(sdata, mgmt->bssid);
+ 			ieee80211_destroy_assoc_data(sdata, false);
  			cfg80211_put_bss(*bss);
  			return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
  		}
 -		printk(KERN_DEBUG "%s: associated\n", sdata->name);
++		sdata_info(sdata, "associated\n");
  
  		/*
  		 * destroy assoc_data afterwards, as otherwise an idle