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

Commit 8abd3f9b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: restrict aggregation to supported interface modes 



We can only support aggregation on AP/STA right now. HT isn't defined
for IBSS, WDS or MESH. In the WDS/MESH cases it's not clear what to
put into the IBSS field, and we don't handle that in the code at all.
Also fix the code to handle VLAN correctly.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b8695a8f

net/mac80211/agg-rx.c

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d 
	memset(mgmt, 0, 24);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);

	if (sdata->vif.type == NL80211_IFTYPE_AP)

	if (sdata->vif.type == NL80211_IFTYPE_AP ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);

	else

		memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);

net/mac80211/agg-tx.c

+15 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata, 
	memset(mgmt, 0, 24);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);

	if (sdata->vif.type == NL80211_IFTYPE_AP)

	if (sdata->vif.type == NL80211_IFTYPE_AP ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);

	else

		memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
@@ -180,6 +181,19 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid) 
		goto exit;

	}



	/*

	 * The aggregation code is not prepared to handle

	 * anything but STA/AP due to the BSSID handling.

	 * IBSS could work in the code but isn't supported

	 * by drivers or the standard.

	 */

	if (sta->sdata->vif.type != NL80211_IFTYPE_STATION &&

	    sta->sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

	    sta->sdata->vif.type != NL80211_IFTYPE_AP) {

		ret = -EINVAL;

		goto exit;

	}



	spin_lock_bh(&sta->lock);



	/* we have tried too many times, receiver does not want A-MPDU */

net/mac80211/ht.c

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, 
	memset(mgmt, 0, 24);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);

	if (sdata->vif.type == NL80211_IFTYPE_AP)

	if (sdata->vif.type == NL80211_IFTYPE_AP ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);

	else

		memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);

net/mac80211/rx.c

+11 −0
Original line number Diff line number Diff line
@@ -1768,6 +1768,17 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 


	switch (mgmt->u.action.category) {

	case WLAN_CATEGORY_BACK:

		/*

		 * The aggregation code is not prepared to handle

		 * anything but STA/AP due to the BSSID handling;

		 * IBSS could work in the code but isn't supported

		 * by drivers or the standard.

		 */

		if (sdata->vif.type != NL80211_IFTYPE_STATION &&

		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

		    sdata->vif.type != NL80211_IFTYPE_AP)

			return RX_DROP_MONITOR;



		switch (mgmt->u.action.u.addba_req.action_code) {

		case WLAN_ACTION_ADDBA_REQ:

			if (len < (IEEE80211_MIN_ACTION_SIZE +