Commit 85249e5f authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

mac80211: tear down of block ack sessions 



This patch adds a clean tear down for all block ack sessions if interface
goes down or if a deauthentication is done.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7b9d44cd

net/mac80211/ieee80211.c

+1 −6
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ static int ieee80211_stop(struct net_device *dev) 
	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_init_conf conf;

	struct sta_info *sta;

	int i;



	/*

	 * Stop TX on this interface first.
@@ -400,11 +399,7 @@ static int ieee80211_stop(struct net_device *dev) 


	list_for_each_entry_rcu(sta, &local->sta_list, list) {

		if (sta->sdata == sdata)

			for (i = 0; i <  STA_TID_NUM; i++)

				ieee80211_sta_stop_rx_ba_session(sdata->dev,

						sta->addr, i,

						WLAN_BACK_RECIPIENT,

						WLAN_REASON_QSTA_LEAVE_QBSS);

			ieee80211_sta_tear_down_BA_sessions(dev, sta->addr);

	}



	rcu_read_unlock();

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -928,10 +928,12 @@ void ieee80211_send_addba_request(struct net_device *dev, const u8 *da, 
				  u16 agg_size, u16 timeout);

void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid,

				u16 initiator, u16 reason_code);



void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *da,

				u16 tid, u16 initiator, u16 reason);

void sta_rx_agg_session_timer_expired(unsigned long data);

void sta_addba_resp_timer_expired(unsigned long data);

void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr);

u64 ieee80211_sta_get_rates(struct ieee80211_local *local,

			    struct ieee802_11_elems *elems,

			    enum ieee80211_band band);

net/mac80211/ieee80211_sta.c

+14 −1
Original line number Diff line number Diff line
@@ -467,8 +467,8 @@ static void ieee80211_set_associated(struct net_device *dev, 
		memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);

		ieee80211_sta_send_associnfo(dev, ifsta);

	} else {

		ieee80211_sta_tear_down_BA_sessions(dev, ifsta->bssid);

		ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;



		netif_carrier_off(dev);

		ieee80211_reset_erp_info(dev);

		memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
@@ -1518,6 +1518,19 @@ void sta_rx_agg_session_timer_expired(unsigned long data) 
					 WLAN_REASON_QSTA_TIMEOUT);

}



void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	int i;



	for (i = 0; i <  STA_TID_NUM; i++) {

		ieee80211_stop_tx_ba_session(&local->hw, addr, i,

					     WLAN_BACK_INITIATOR);

		ieee80211_sta_stop_rx_ba_session(dev, addr, i,

						 WLAN_BACK_RECIPIENT,

						 WLAN_REASON_QSTA_LEAVE_QBSS);

	}

}



static void ieee80211_rx_mgmt_auth(struct net_device *dev,

				   struct ieee80211_if_sta *ifsta,