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

cfg80211/nl80211: clarify TX queue API 



With the plan to change mac80211's queue API to
not map ACs to queues 1:1, it seems necessary to
clarify some APIs that act on ACs rather than on
queues to spell that out explicitly. Do this.

Also verify that the AC number given is valid.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d748b464

include/linux/nl80211.h

+15 −7
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ enum nl80211_mesh_setup_params { 
/**

 * enum nl80211_txq_attr - TX queue parameter attributes

 * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved

 * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)

 * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)

 * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning

 *	disabled

 * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
@@ -2236,7 +2236,7 @@ enum nl80211_mesh_setup_params { 
 */

enum nl80211_txq_attr {

	__NL80211_TXQ_ATTR_INVALID,

	NL80211_TXQ_ATTR_QUEUE,

	NL80211_TXQ_ATTR_AC,

	NL80211_TXQ_ATTR_TXOP,

	NL80211_TXQ_ATTR_CWMIN,

	NL80211_TXQ_ATTR_CWMAX,
@@ -2247,13 +2247,21 @@ enum nl80211_txq_attr { 
	NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1

};



enum nl80211_txq_q {

	NL80211_TXQ_Q_VO,

	NL80211_TXQ_Q_VI,

	NL80211_TXQ_Q_BE,

	NL80211_TXQ_Q_BK

enum nl80211_ac {

	NL80211_AC_VO,

	NL80211_AC_VI,

	NL80211_AC_BE,

	NL80211_AC_BK,

	NL80211_NUM_ACS

};



/* backward compat */

#define NL80211_TXQ_ATTR_QUEUE	NL80211_TXQ_ATTR_AC

#define NL80211_TXQ_Q_VO	NL80211_AC_VO

#define NL80211_TXQ_Q_VI	NL80211_AC_VI

#define NL80211_TXQ_Q_BE	NL80211_AC_BE

#define NL80211_TXQ_Q_BK	NL80211_AC_BK



enum nl80211_channel_type {

	NL80211_CHAN_NO_HT,

	NL80211_CHAN_HT20,

include/net/cfg80211.h

+2 −2
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ struct mesh_setup { 


/**

 * struct ieee80211_txq_params - TX queue parameters

 * @queue: TX queue identifier (NL80211_TXQ_Q_*)

 * @ac: AC identifier

 * @txop: Maximum burst time in units of 32 usecs, 0 meaning disabled

 * @cwmin: Minimum contention window [a value of the form 2^n-1 in the range

 *	1..32767]
@@ -854,7 +854,7 @@ struct mesh_setup { 
 * @aifs: Arbitration interframe space [0..255]

 */

struct ieee80211_txq_params {

	enum nl80211_txq_q queue;

	enum nl80211_ac ac;

	u16 txop;

	u16 cwmin;

	u16 cwmax;

include/net/mac80211.h

+1 −1
Original line number Diff line number Diff line
@@ -2222,7 +2222,7 @@ struct ieee80211_ops { 
			      struct ieee80211_sta *sta,

			      u32 changed);

	int (*conf_tx)(struct ieee80211_hw *hw,

		       struct ieee80211_vif *vif, u16 queue,

		       struct ieee80211_vif *vif, u16 ac,

		       const struct ieee80211_tx_queue_params *params);

	u64 (*get_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

	void (*set_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

net/mac80211/cfg.c

+5 −5
Original line number Diff line number Diff line
@@ -1449,14 +1449,14 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy, 
	 */

	p.uapsd = false;



	if (params->queue >= local->hw.queues)

	if (params->ac >= local->hw.queues)

		return -EINVAL;



	sdata->tx_conf[params->queue] = p;

	if (drv_conf_tx(local, sdata, params->queue, &p)) {

	sdata->tx_conf[params->ac] = p;

	if (drv_conf_tx(local, sdata, params->ac, &p)) {

		wiphy_debug(local->hw.wiphy,

			    "failed to set TX queue parameters for queue %d\n",

			    params->queue);

			    "failed to set TX queue parameters for AC %d\n",

			    params->ac);

		return -EINVAL;

	}

net/mac80211/driver-ops.h

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static inline void drv_sta_rc_update(struct ieee80211_local *local, 
}



static inline int drv_conf_tx(struct ieee80211_local *local,

			      struct ieee80211_sub_if_data *sdata, u16 queue,

			      struct ieee80211_sub_if_data *sdata, u16 ac,

			      const struct ieee80211_tx_queue_params *params)

{

	int ret = -EOPNOTSUPP;
@@ -501,10 +501,10 @@ static inline int drv_conf_tx(struct ieee80211_local *local, 


	check_sdata_in_driver(sdata);



	trace_drv_conf_tx(local, sdata, queue, params);

	trace_drv_conf_tx(local, sdata, ac, params);

	if (local->ops->conf_tx)

		ret = local->ops->conf_tx(&local->hw, &sdata->vif,

					  queue, params);

					  ac, params);

	trace_drv_return_int(local, ret);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE