Commit 50ae0cf1 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

mac80211: add debugfs interface for U-APSD queue configuration 



Because it's not yet decided how to configure which queues are U-APSD
enabled, add a debugfs interface for testing purposes.

Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ab13315a

net/mac80211/debugfs.c

+94 −0
Original line number Diff line number Diff line
@@ -158,6 +158,98 @@ static const struct file_operations noack_ops = { 
	.open = mac80211_open_file_generic

};



static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf,

				 size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	int res;

	char buf[10];



	res = scnprintf(buf, sizeof(buf), "0x%x\n", local->uapsd_queues);



	return simple_read_from_buffer(user_buf, count, ppos, buf, res);

}



static ssize_t uapsd_queues_write(struct file *file,

				  const char __user *user_buf,

				  size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	unsigned long val;

	char buf[10];

	size_t len;

	int ret;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

	buf[len] = '\0';



	ret = strict_strtoul(buf, 0, &val);



	if (ret)

		return -EINVAL;



	if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)

		return -ERANGE;



	local->uapsd_queues = val;



	return count;

}



static const struct file_operations uapsd_queues_ops = {

	.read = uapsd_queues_read,

	.write = uapsd_queues_write,

	.open = mac80211_open_file_generic

};



static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf,

				     size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	int res;

	char buf[10];



	res = scnprintf(buf, sizeof(buf), "0x%x\n", local->uapsd_max_sp_len);



	return simple_read_from_buffer(user_buf, count, ppos, buf, res);

}



static ssize_t uapsd_max_sp_len_write(struct file *file,

				      const char __user *user_buf,

				      size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	unsigned long val;

	char buf[10];

	size_t len;

	int ret;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

	buf[len] = '\0';



	ret = strict_strtoul(buf, 0, &val);



	if (ret)

		return -EINVAL;



	if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)

		return -ERANGE;



	local->uapsd_max_sp_len = val;



	return count;

}



static const struct file_operations uapsd_max_sp_len_ops = {

	.read = uapsd_max_sp_len_read,

	.write = uapsd_max_sp_len_write,

	.open = mac80211_open_file_generic

};



static ssize_t queues_read(struct file *file, char __user *user_buf,

			   size_t count, loff_t *ppos)

{
@@ -314,6 +406,8 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	DEBUGFS_ADD(queues);

	DEBUGFS_ADD_MODE(reset, 0200);

	DEBUGFS_ADD(noack);

	DEBUGFS_ADD(uapsd_queues);

	DEBUGFS_ADD(uapsd_max_sp_len);



	statsd = debugfs_create_dir("statistics", phyd);

net/mac80211/ieee80211_i.h

+14 −0
Original line number Diff line number Diff line
@@ -808,6 +808,20 @@ struct ieee80211_local { 
	int wifi_wme_noack_test;

	unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */



	/*

	 * Bitmask of enabled u-apsd queues,

	 * IEEE80211_WMM_IE_STA_QOSINFO_AC_BE & co. Needs a new association

	 * to take effect.

	 */

	unsigned int uapsd_queues;



	/*

	 * Maximum number of buffered frames AP can deliver during a

	 * service period, IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL or similar.

	 * Needs a new association to take effect.

	 */

	unsigned int uapsd_max_sp_len;



	bool pspolling;

	bool offchannel_ps_enabled;

	/*

net/mac80211/main.c

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, 
	local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;

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

	local->user_power_level = -1;

	local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;

	local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;



	INIT_LIST_HEAD(&local->interfaces);

	mutex_init(&local->iflist_mtx);

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local, 
		return;



	if (ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED)

		uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;

		uapsd_queues = local->uapsd_queues;



	count = wmm_param[6] & 0x0f;

	if (count == ifmgd->wmm_last_param_set)

net/mac80211/work.c

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, 


	if (wk->assoc.wmm_used && local->hw.queues >= 4) {

		if (wk->assoc.uapsd_used) {

			qos_info = IEEE80211_DEFAULT_UAPSD_QUEUES;

			qos_info |= (IEEE80211_DEFAULT_MAX_SP_LEN <<

			qos_info = local->uapsd_queues;

			qos_info |= (local->uapsd_max_sp_len <<

				     IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT);

		} else {

			qos_info = 0;