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

Commit 0eeb2b67 authored by Sara Sharon's avatar Sara Sharon Committed by Johannes Berg
Browse files

mac80211: add an option for station management TXQ 



We have a TXQ abstraction for non-data packets that need
powersave buffering. Since the AP cannot sleep, in case
of station we can use this TXQ for all management frames,
regardless if they are bufferable. Add HW flag to allow
that.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent add7453a

include/net/mac80211.h

+5 −0
Original line number Diff line number Diff line
@@ -2152,6 +2152,10 @@ struct ieee80211_txq { 
 *	but if the rate control is built-in then it must be set by the driver.

 *	See also the documentation for that flag.

 *

 * @IEEE80211_HW_STA_MMPDU_TXQ: use the extra non-TID per-station TXQ for all

 *	MMPDUs on station interfaces. This of course requires the driver to use

 *	TXQs to start with.

 *

 * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays

 */

enum ieee80211_hw_flags {
@@ -2199,6 +2203,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP,

	IEEE80211_HW_BUFF_MMPDU_TXQ,

	IEEE80211_HW_SUPPORTS_VHT_EXT_NSS_BW,

	IEEE80211_HW_STA_MMPDU_TXQ,



	/* keep last, obviously */

	NUM_IEEE80211_HW_FLAGS

net/mac80211/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static const char *hw_flag_names[] = { 
	FLAG(DOESNT_SUPPORT_QOS_NDP),

	FLAG(BUFF_MMPDU_TXQ),

	FLAG(SUPPORTS_VHT_EXT_NSS_BW),

	FLAG(STA_MMPDU_TXQ),

#undef FLAG

};

net/mac80211/tx.c

+11 −3
Original line number Diff line number Diff line
@@ -1251,7 +1251,8 @@ static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local, 


	if (unlikely(!ieee80211_is_data_present(hdr->frame_control))) {

		if ((!ieee80211_is_mgmt(hdr->frame_control) ||

		     ieee80211_is_bufferable_mmpdu(hdr->frame_control)) &&

		     ieee80211_is_bufferable_mmpdu(hdr->frame_control) ||

		     vif->type == NL80211_IFTYPE_STATION) &&

		    sta && sta->uploaded) {

			/*

			 * This will be NULL if the driver didn't set the
@@ -1456,9 +1457,16 @@ void ieee80211_txq_init(struct ieee80211_sub_if_data *sdata, 
	}



	if (tid == IEEE80211_NUM_TIDS) {

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

			/* Drivers need to opt in to the management MPDU TXQ */

			if (!ieee80211_hw_check(&sdata->local->hw,

						STA_MMPDU_TXQ))

				return;

		} else if (!ieee80211_hw_check(&sdata->local->hw,

					       BUFF_MMPDU_TXQ)) {

			/* Drivers need to opt in to the bufferable MMPDU TXQ */

		if (!ieee80211_hw_check(&sdata->local->hw, BUFF_MMPDU_TXQ))

			return;

		}

		txqi->txq.ac = IEEE80211_AC_VO;

	} else {

		txqi->txq.ac = ieee80211_ac_from_tid(tid);