From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 18 Jun 2013 18:04:51 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9d1059c2481885ba7a2af02fc1bf87cae88b302a;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

9d1059c2481885ba7a2af02fc1bf87cae88b302a
diff --cc net/mac80211/mlme.c
index ad9bb9e10cbb,741448b30825..9e49f557fa5c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2643,12 -2743,16 +2713,15 @@@ static bool ieee80211_assoc_success(str
  	ieee80211_sta_rx_notify(sdata, (struct ieee80211_hdr *)mgmt);
  	ieee80211_sta_reset_beacon_monitor(sdata);
  
- 	return true;
+ 	ret = true;
+  out:
+ 	kfree(bss_ies);
+ 	return ret;
  }
  
 -static enum rx_mgmt_action __must_check
 -ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 -			     struct ieee80211_mgmt *mgmt, size_t len,
 -			     struct cfg80211_bss **bss)
 +static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 +					 struct ieee80211_mgmt *mgmt,
 +					 size_t len)
  {
  	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
  	struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;