Commit ae2772b3 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by John W. Linville
Browse files

mac80211: allow frame aggregation for mesh 



Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarAshok Nagarajan <anagar6@uic.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 739522ba

net/mac80211/agg-rx.c

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d 
	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

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

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||

	    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)

		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);

net/mac80211/agg-tx.c

+3 −7
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata, 
	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

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

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||

	    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)

		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
@@ -371,13 +372,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	       pubsta->addr, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	/*

	 * 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_MESH_POINT &&

	    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

	    sdata->vif.type != NL80211_IFTYPE_AP)

		return -EINVAL;

net/mac80211/ht.c

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, 
	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

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

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||

	    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)

		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);

net/mac80211/rx.c

+1 −6
Original line number Diff line number Diff line
@@ -2203,13 +2203,8 @@ 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_MESH_POINT &&

		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

		    sdata->vif.type != NL80211_IFTYPE_AP)

			break;