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

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

nl80211: Add set/get for frag/rts threshold and retry limits 



Add new nl80211 attributes that can be used with NL80211_CMD_SET_WIPHY
and NL80211_CMD_GET_WIPHY to manage fragmentation/RTS threshold and
retry limits.

Since these values are stored in struct wiphy, remove the local copy
from mac80211 where feasible (frag & rts threshold). The retry limits
are currently needed in struct ieee80211_conf, but these could be
eventually removed since the driver should have access to the values
in struct wiphy.

Signed-off-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e52b062

include/linux/nl80211.h

+22 −2
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ 
 *	to get a list of all present wiphys.

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

 *	%NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,

 *	%NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, and/or

 *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE.

 *	%NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ,

 *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE, %NL80211_ATTR_WIPHY_RETRY_SHORT,

 *	%NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,

 *	and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.

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

 *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and

 *	%NL80211_ATTR_WIPHY_NAME.
@@ -337,6 +339,18 @@ enum nl80211_commands { 
 *	NL80211_CHAN_HT20 = HT20 only

 *	NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel

 *	NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel

 * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is

 *	less than or equal to the RTS threshold; allowed range: 1..255;

 *	dot11ShortRetryLimit; u8

 * @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is

 *	greater than the RTS threshold; allowed range: 1..255;

 *	dot11ShortLongLimit; u8

 * @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum

 *	length in octets for frames; allowed range: 256..8000, disable

 *	fragmentation with (u32)-1; dot11FragmentationThreshold; u32

 * @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length

 *	larger than or equal to this use RTS/CTS handshake); allowed range:

 *	0..65536, disable with (u32)-1; dot11RTSThreshold; u32

 *

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

 * @NL80211_ATTR_IFNAME: network interface name
@@ -565,6 +579,12 @@ enum nl80211_attrs { 


	NL80211_ATTR_FREQ_FIXED,





	NL80211_ATTR_WIPHY_RETRY_SHORT,

	NL80211_ATTR_WIPHY_RETRY_LONG,

	NL80211_ATTR_WIPHY_FRAG_THRESHOLD,

	NL80211_ATTR_WIPHY_RTS_THRESHOLD,



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



	__NL80211_ATTR_AFTER_LAST,

include/net/cfg80211.h

+50 −0
Original line number Diff line number Diff line
@@ -743,6 +743,20 @@ struct cfg80211_ibss_params { 
	bool channel_fixed;

};



/**

 * enum wiphy_params_flags - set_wiphy_params bitfield values

 * WIPHY_PARAM_RETRY_SHORT: wiphy->retry_short has changed

 * WIPHY_PARAM_RETRY_LONG: wiphy->retry_long has changed

 * WIPHY_PARAM_FRAG_THRESHOLD: wiphy->frag_threshold has changed

 * WIPHY_PARAM_RTS_THRESHOLD: wiphy->rts_threshold has changed

 */

enum wiphy_params_flags {

	WIPHY_PARAM_RETRY_SHORT		= 1 << 0,

	WIPHY_PARAM_RETRY_LONG		= 1 << 1,

	WIPHY_PARAM_FRAG_THRESHOLD	= 1 << 2,

	WIPHY_PARAM_RTS_THRESHOLD	= 1 << 3,

};



/**

 * struct cfg80211_ops - backend description for wireless configuration

 *
@@ -823,6 +837,11 @@ struct cfg80211_ibss_params { 
 *	cfg80211_ibss_joined(), also call that function when changing BSSID due

 *	to a merge.

 * @leave_ibss: Leave the IBSS.

 *

 * @set_wiphy_params: Notify that wiphy parameters have changed;

 *	@changed bitfield (see &enum wiphy_params_flags) describes which values

 *	have changed. The actual parameter values are available in

 *	struct wiphy. If returning an error, no value should be changed.

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy);
@@ -912,6 +931,8 @@ struct cfg80211_ops { 
	int	(*join_ibss)(struct wiphy *wiphy, struct net_device *dev,

			     struct cfg80211_ibss_params *params);

	int	(*leave_ibss)(struct wiphy *wiphy, struct net_device *dev);



	int	(*set_wiphy_params)(struct wiphy *wiphy, u32 changed);

};



/*
@@ -945,6 +966,11 @@ struct cfg80211_ops { 
 * @signal_type: signal type reported in &struct cfg80211_bss.

 * @cipher_suites: supported cipher suites

 * @n_cipher_suites: number of supported cipher suites

 * @retry_short: Retry limit for short frames (dot11ShortRetryLimit)

 * @retry_long: Retry limit for long frames (dot11LongRetryLimit)

 * @frag_threshold: Fragmentation threshold (dot11FragmentationThreshold);

 *	-1 = fragmentation disabled, only odd values >= 256 used

 * @rts_threshold: RTS threshold (dot11RTSThreshold); -1 = RTS/CTS disabled

 */

struct wiphy {

	/* assign these fields before you register the wiphy */
@@ -967,6 +993,11 @@ struct wiphy { 
	int n_cipher_suites;

	const u32 *cipher_suites;



	u8 retry_short;

	u8 retry_long;

	u32 frag_threshold;

	u32 rts_threshold;



	/* If multiple wiphys are registered and you're handed e.g.

	 * a regular netdev with assigned ieee80211_ptr, you won't

	 * know whether it points to a wiphy your driver has registered
@@ -1345,6 +1376,25 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev, 
struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,

					     struct iw_freq *freq);



int cfg80211_wext_siwrts(struct net_device *dev,

			 struct iw_request_info *info,

			 struct iw_param *rts, char *extra);

int cfg80211_wext_giwrts(struct net_device *dev,

			 struct iw_request_info *info,

			 struct iw_param *rts, char *extra);

int cfg80211_wext_siwfrag(struct net_device *dev,

			  struct iw_request_info *info,

			  struct iw_param *frag, char *extra);

int cfg80211_wext_giwfrag(struct net_device *dev,

			  struct iw_request_info *info,

			  struct iw_param *frag, char *extra);

int cfg80211_wext_siwretry(struct net_device *dev,

			   struct iw_request_info *info,

			   struct iw_param *retry, char *extra);

int cfg80211_wext_giwretry(struct net_device *dev,

			   struct iw_request_info *info,

			   struct iw_param *retry, char *extra);



/*

 * callbacks for asynchronous cfg80211 methods, notification

 * functions and BSS handling helpers

net/mac80211/cfg.c

+27 −0
Original line number Diff line number Diff line
@@ -1298,6 +1298,32 @@ static int ieee80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
	return ieee80211_ibss_leave(sdata);

}



static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	if (changed & WIPHY_PARAM_RTS_THRESHOLD) {

		int err;



		if (local->ops->set_rts_threshold) {

			err = local->ops->set_rts_threshold(

				local_to_hw(local), wiphy->rts_threshold);

			if (err)

				return err;

		}

	}



	if (changed & WIPHY_PARAM_RETRY_SHORT)

		local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;

	if (changed & WIPHY_PARAM_RETRY_LONG)

		local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;

	if (changed &

	    (WIPHY_PARAM_RETRY_SHORT | WIPHY_PARAM_RETRY_LONG))

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_RETRY_LIMITS);



	return 0;

}



struct cfg80211_ops mac80211_config_ops = {

	.add_virtual_intf = ieee80211_add_iface,

	.del_virtual_intf = ieee80211_del_iface,
@@ -1336,4 +1362,5 @@ struct cfg80211_ops mac80211_config_ops = { 
	.disassoc = ieee80211_disassoc,

	.join_ibss = ieee80211_join_ibss,

	.leave_ibss = ieee80211_leave_ibss,

	.set_wiphy_params = ieee80211_set_wiphy_params,

};

net/mac80211/debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ static const struct file_operations name## _ops = { \ 
DEBUGFS_READONLY_FILE(frequency, 20, "%d",

		      local->hw.conf.channel->center_freq);

DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",

		      local->rts_threshold);

		      local->hw.wiphy->rts_threshold);

DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d",

		      local->fragmentation_threshold);

		      local->hw.wiphy->frag_threshold);

DEBUGFS_READONLY_FILE(short_retry_limit, 20, "%d",

		      local->hw.conf.short_frame_max_tx_count);

		      local->hw.wiphy->retry_short);

DEBUGFS_READONLY_FILE(long_retry_limit, 20, "%d",

		      local->hw.conf.long_frame_max_tx_count);

		      local->hw.wiphy->retry_long);

DEBUGFS_READONLY_FILE(total_ps_buffered, 20, "%d",

		      local->total_ps_buffered);

DEBUGFS_READONLY_FILE(wep_iv, 20, "%#08x",

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -643,9 +643,6 @@ struct ieee80211_local { 


	struct rate_control_ref *rate_ctrl;



	int rts_threshold;

	int fragmentation_threshold;



	struct crypto_blkcipher *wep_tx_tfm;

	struct crypto_blkcipher *wep_rx_tfm;

	u32 wep_iv;