Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (8d6fcbdb) · Commits · e / devices / android_kernel_samsung_universal8890

net/mac80211/mlme.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -1342,7 +1342,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
		struct ieee80211_local *local = sdata->local;
		struct sta_info *sta;
		u32 changed = 0;
		u8 bssid[ETH_ALEN];

		ASSERT_MGD_MTX(ifmgd);

		@@ -1354,10 +1353,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,

		ieee80211_stop_poll(sdata);

		memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);

		ifmgd->associated = NULL;
		memset(ifmgd->bssid, 0, ETH_ALEN);

		/*
		* we need to commit the associated = NULL change because the
		@@ -1377,7 +1373,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
		netif_carrier_off(sdata->dev);

		mutex_lock(&local->sta_mtx);
		sta = sta_info_get(sdata, bssid);
		sta = sta_info_get(sdata, ifmgd->bssid);
		if (sta) {
		set_sta_flag(sta, WLAN_STA_BLOCK_BA);
		ieee80211_sta_tear_down_BA_sessions(sta, tx);
		@@ -1386,13 +1382,16 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,

		/* deauthenticate/disassociate now */
		if (tx \|\| frame_buf)
		ieee80211_send_deauth_disassoc(sdata, bssid, stype, reason,
		tx, frame_buf);
		ieee80211_send_deauth_disassoc(sdata, ifmgd->bssid, stype,
		reason, tx, frame_buf);

		/* flush out frame */
		if (tx)
		drv_flush(local, false);

		/* clear bssid only after building the needed mgmt frames */
		memset(ifmgd->bssid, 0, ETH_ALEN);

		/* remove AP and TDLS peers */
		sta_info_flush(local, sdata);