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

Commit 31888487 authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

nl80211: Add TX queue parameter configuration 



Add a new attribute, NL80211_ATTR_WIPHY_TXQ_PARAMS, that can be used with
NL80211_CMD_SET_WIPHY for userspace (e.g., hostapd) to set TX queue
parameters (txop, cwmin, cwmax, aifs).

Signed-off-by: default avatarJouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1e898ff8

include/linux/nl80211.h

+41 −2
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
 *

 * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request

 *	to get a list of all present wiphys.

 * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and

 *	%NL80211_ATTR_WIPHY_NAME.

 * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or

 *	%NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME

 *	and/or %NL80211_ATTR_WIPHY_TXQ_PARAMS.

 * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request

 *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and

 *	%NL80211_ATTR_WIPHY_NAME.
@@ -178,6 +179,7 @@ enum nl80211_commands { 
 * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.

 *	/sys/class/ieee80211/<phyname>/index

 * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)

 * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters

 *

 * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on

 * @NL80211_ATTR_IFNAME: network interface name
@@ -312,6 +314,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_BSS_BASIC_RATES,



	NL80211_ATTR_WIPHY_TXQ_PARAMS,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,
@@ -324,6 +328,7 @@ enum nl80211_attrs { 
 */

#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY

#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES

#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS



#define NL80211_MAX_SUPP_RATES			32

#define NL80211_MAX_SUPP_REG_RULES		32
@@ -698,4 +703,38 @@ enum nl80211_meshconf_params { 
	NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1

};



/**

 * 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_TXOP: Maximum burst time in units of 32 usecs, 0 meaning

 *	disabled

 * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form

 *	2^n-1 in the range 1..32767]

 * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form

 *	2^n-1 in the range 1..32767]

 * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]

 * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal

 * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number

 */

enum nl80211_txq_attr {

	__NL80211_TXQ_ATTR_INVALID,

	NL80211_TXQ_ATTR_QUEUE,

	NL80211_TXQ_ATTR_TXOP,

	NL80211_TXQ_ATTR_CWMIN,

	NL80211_TXQ_ATTR_CWMAX,

	NL80211_TXQ_ATTR_AIFS,



	/* keep last */

	__NL80211_TXQ_ATTR_AFTER_LAST,

	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

};



#endif /* __LINUX_NL80211_H */

include/net/cfg80211.h

+23 −0
Original line number Diff line number Diff line
@@ -371,6 +371,24 @@ struct mesh_config { 
	u16 dot11MeshHWMPnetDiameterTraversalTime;

};



/**

 * struct ieee80211_txq_params - TX queue parameters

 * @queue: TX queue identifier (NL80211_TXQ_Q_*)

 * @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]

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

 *	1..32767]

 * @aifs: Arbitration interframe space [0..255]

 */

struct ieee80211_txq_params {

	enum nl80211_txq_q queue;

	u16 txop;

	u16 cwmin;

	u16 cwmax;

	u8 aifs;

};



/* from net/wireless.h */

struct wiphy;
@@ -430,6 +448,8 @@ struct wiphy; 
 * @set_mesh_cfg: set mesh parameters (by now, just mesh id)

 *

 * @change_bss: Modify parameters for a given BSS.

 *

 * @set_txq_params: Set TX queue parameters

 */

struct cfg80211_ops {

	int	(*add_virtual_intf)(struct wiphy *wiphy, char *name,
@@ -490,6 +510,9 @@ struct cfg80211_ops { 
				const struct mesh_config *nconf, u32 mask);

	int	(*change_bss)(struct wiphy *wiphy, struct net_device *dev,

			      struct bss_parameters *params);



	int	(*set_txq_params)(struct wiphy *wiphy,

				  struct ieee80211_txq_params *params);

};



#endif /* __NET_CFG80211_H */

net/mac80211/cfg.c

+25 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,30 @@ static int ieee80211_change_bss(struct wiphy *wiphy, 
	return 0;

}



static int ieee80211_set_txq_params(struct wiphy *wiphy,

				    struct ieee80211_txq_params *params)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_tx_queue_params p;



	if (!local->ops->conf_tx)

		return -EOPNOTSUPP;



	memset(&p, 0, sizeof(p));

	p.aifs = params->aifs;

	p.cw_max = params->cwmax;

	p.cw_min = params->cwmin;

	p.txop = params->txop;

	if (local->ops->conf_tx(local_to_hw(local), params->queue, &p)) {

		printk(KERN_DEBUG "%s: failed to set TX queue "

		       "parameters for queue %d\n", local->mdev->name,

		       params->queue);

		return -EINVAL;

	}



	return 0;

}



struct cfg80211_ops mac80211_config_ops = {

	.add_virtual_intf = ieee80211_add_iface,

	.del_virtual_intf = ieee80211_del_iface,
@@ -1095,4 +1119,5 @@ struct cfg80211_ops mac80211_config_ops = { 
	.get_mesh_params = ieee80211_get_mesh_params,

#endif

	.change_bss = ieee80211_change_bss,

	.set_txq_params = ieee80211_set_txq_params,

};

net/wireless/nl80211.c

+62 −5
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = { 
	[NL80211_ATTR_WIPHY] = { .type = NLA_U32 },

	[NL80211_ATTR_WIPHY_NAME] = { .type = NLA_NUL_STRING,

				      .len = BUS_ID_SIZE-1 },

	[NL80211_ATTR_WIPHY_TXQ_PARAMS] = { .type = NLA_NESTED },



	[NL80211_ATTR_IFTYPE] = { .type = NLA_U32 },

	[NL80211_ATTR_IFINDEX] = { .type = NLA_U32 },
@@ -286,20 +287,76 @@ static int nl80211_get_wiphy(struct sk_buff *skb, struct genl_info *info) 
	return -ENOBUFS;

}



static const struct nla_policy txq_params_policy[NL80211_TXQ_ATTR_MAX + 1] = {

	[NL80211_TXQ_ATTR_QUEUE]		= { .type = NLA_U8 },

	[NL80211_TXQ_ATTR_TXOP]			= { .type = NLA_U16 },

	[NL80211_TXQ_ATTR_CWMIN]		= { .type = NLA_U16 },

	[NL80211_TXQ_ATTR_CWMAX]		= { .type = NLA_U16 },

	[NL80211_TXQ_ATTR_AIFS]			= { .type = NLA_U8 },

};



static int parse_txq_params(struct nlattr *tb[],

			    struct ieee80211_txq_params *txq_params)

{

	if (!tb[NL80211_TXQ_ATTR_QUEUE] || !tb[NL80211_TXQ_ATTR_TXOP] ||

	    !tb[NL80211_TXQ_ATTR_CWMIN] || !tb[NL80211_TXQ_ATTR_CWMAX] ||

	    !tb[NL80211_TXQ_ATTR_AIFS])

		return -EINVAL;



	txq_params->queue = nla_get_u8(tb[NL80211_TXQ_ATTR_QUEUE]);

	txq_params->txop = nla_get_u16(tb[NL80211_TXQ_ATTR_TXOP]);

	txq_params->cwmin = nla_get_u16(tb[NL80211_TXQ_ATTR_CWMIN]);

	txq_params->cwmax = nla_get_u16(tb[NL80211_TXQ_ATTR_CWMAX]);

	txq_params->aifs = nla_get_u8(tb[NL80211_TXQ_ATTR_AIFS]);



	return 0;

}



static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)

{

	struct cfg80211_registered_device *rdev;

	int result;



	if (!info->attrs[NL80211_ATTR_WIPHY_NAME])

		return -EINVAL;

	int result = 0, rem_txq_params = 0;

	struct nlattr *nl_txq_params;



	rdev = cfg80211_get_dev_from_info(info);

	if (IS_ERR(rdev))

		return PTR_ERR(rdev);



	result = cfg80211_dev_rename(rdev, nla_data(info->attrs[NL80211_ATTR_WIPHY_NAME]));

	if (info->attrs[NL80211_ATTR_WIPHY_NAME]) {

		result = cfg80211_dev_rename(

			rdev, nla_data(info->attrs[NL80211_ATTR_WIPHY_NAME]));

		if (result)

			goto bad_res;

	}



	if (info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS]) {

		struct ieee80211_txq_params txq_params;

		struct nlattr *tb[NL80211_TXQ_ATTR_MAX + 1];



		if (!rdev->ops->set_txq_params) {

			result = -EOPNOTSUPP;

			goto bad_res;

		}



		nla_for_each_nested(nl_txq_params,

				    info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],

				    rem_txq_params) {

			nla_parse(tb, NL80211_TXQ_ATTR_MAX,

				  nla_data(nl_txq_params),

				  nla_len(nl_txq_params),

				  txq_params_policy);

			result = parse_txq_params(tb, &txq_params);

			if (result)

				goto bad_res;



			result = rdev->ops->set_txq_params(&rdev->wiphy,

							   &txq_params);

			if (result)

				goto bad_res;

		}

	}



bad_res:

	cfg80211_put_dev(rdev);

	return result;

}