Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5e5bf25 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

mac80211: remove disassociation code from ieee80211_set_associated 



This patch moves disassociation code from ieee80211_set_associated
to ieee80211_set_disassoc. To reduce code duplication, it introduces
the ieee80211_sta_send_apinfo function. Additionally, it fixes a lapse
where BSS_CHANGED_HT wasn't set when notifying the driver of changes
due to disassociation.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b7ee69d

net/mac80211/mlme.c

+56 −46
Original line number Diff line number Diff line
@@ -352,6 +352,17 @@ int ieee80211_ht_addt_info_ie_to_ht_bss_info( 
	return 0;

}



static void ieee80211_sta_send_apinfo(struct ieee80211_sub_if_data *sdata,

					struct ieee80211_if_sta *ifsta)

{

	union iwreq_data wrqu;

	memset(&wrqu, 0, sizeof(wrqu));

	if (ifsta->flags & IEEE80211_STA_ASSOCIATED)

		memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);

	wrqu.ap_addr.sa_family = ARPHRD_ETHER;

	wireless_send_event(sdata->dev, SIOCGIWAP, &wrqu, NULL);

}



static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,

					 struct ieee80211_if_sta *ifsta)

{
@@ -373,15 +384,12 @@ static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata, 




static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,

				     struct ieee80211_if_sta *ifsta,

				     bool assoc)

				     struct ieee80211_if_sta *ifsta)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_conf *conf = &local_to_hw(local)->conf;

	union iwreq_data wrqu;

	u32 changed = BSS_CHANGED_ASSOC;



	if (assoc) {

	struct ieee80211_sta_bss *bss;



	ifsta->flags |= IEEE80211_STA_ASSOCIATED;
@@ -412,29 +420,17 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, 


	ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET;

	memcpy(ifsta->prev_bssid, sdata->u.sta.bssid, ETH_ALEN);

		memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);

	ieee80211_sta_send_associnfo(sdata, ifsta);

	} else {

		ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;

		changed |= ieee80211_reset_erp_info(sdata);



		sdata->bss_conf.assoc_ht = 0;

		sdata->bss_conf.ht_conf = NULL;

		sdata->bss_conf.ht_bss_conf = NULL;



		memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);

	}

	ifsta->last_probe = jiffies;

	ieee80211_led_assoc(local, assoc);

	ieee80211_led_assoc(local, 1);



	sdata->bss_conf.assoc = assoc;

	sdata->bss_conf.assoc = 1;

	ieee80211_bss_info_change_notify(sdata, changed);



	if (assoc)

	netif_carrier_on(sdata->dev);



	wrqu.ap_addr.sa_family = ARPHRD_ETHER;

	wireless_send_event(sdata->dev, SIOCGIWAP, &wrqu, NULL);

	ieee80211_sta_send_apinfo(sdata, ifsta);

}



void ieee80211_sta_tx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
@@ -836,6 +832,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	u32 changed = BSS_CHANGED_ASSOC;



	rcu_read_lock();
@@ -863,7 +860,20 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
			ieee80211_send_disassoc(sdata, ifsta, reason);

	}



	ieee80211_set_associated(sdata, ifsta, 0);

	ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;

	changed |= ieee80211_reset_erp_info(sdata);



	if (sdata->bss_conf.assoc_ht)

		changed |= BSS_CHANGED_HT;



	sdata->bss_conf.assoc_ht = 0;

	sdata->bss_conf.ht_conf = NULL;

	sdata->bss_conf.ht_bss_conf = NULL;



	ieee80211_led_assoc(local, 0);

	sdata->bss_conf.assoc = 0;



	ieee80211_sta_send_apinfo(sdata, ifsta);



	if (self_disconnected)

		ifsta->state = IEEE80211_STA_MLME_DISABLED;
@@ -2081,7 +2091,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
	 * ieee80211_set_associated() will tell the driver */

	bss_conf->aid = aid;

	bss_conf->assoc_capability = capab_info;

	ieee80211_set_associated(sdata, ifsta, 1);

	ieee80211_set_associated(sdata, ifsta);



	ieee80211_associated(sdata, ifsta);

}