Commit c6e13327 authored Jan 23, 2014 by Karl Beldan Committed by Johannes Berg Feb 04, 2014

mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec

ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
the BA parameters. In the discussion [1] about this patch, Johannes
recalled that it fixed some races with the DELBA and indeed this
behavior was introduced in [2].
While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
their BA params TID AC violates the spec and is more a workaround for
some drivers. Helmut expressed some concerns wrt such drivers, in
particular DELBAs in rt2x00.

ATM, DELBAs are sent after a driver has called (hence "purposely")
ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
given to the driver ampdu_action supposed to call this function, which
could prove handy to people trying to do the right thing in faulty
drivers (if their fw/hw don't get in their way).

[1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com


[2] Commit: cf6bb79a ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 0037db63

net/mac80211/agg-tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
		mgmt->u.action.u.addba_req.start_seq_num =
		cpu_to_le16(start_seq_num << 4);

		ieee80211_tx_skb_tid(sdata, skb, tid);
		ieee80211_tx_skb(sdata, skb);
		}

		void ieee80211_send_bar(struct ieee80211_vif vif, u8 ra, u16 tid, u16 ssn)

net/mac80211/ht.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
		mgmt->u.action.u.delba.params = cpu_to_le16(params);
		mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);

		ieee80211_tx_skb_tid(sdata, skb, tid);
		ieee80211_tx_skb(sdata, skb);
		}

		void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,

Admin message