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

Commit 6fd67e93 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by John W. Linville
Browse files

mac80211: remove debugfs noack test 



This feature has been superseded by the NoAck per Queue feature.

Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarMathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eb1852b1

net/mac80211/debugfs.c

+0 −35
Original line number Diff line number Diff line
@@ -97,40 +97,6 @@ static const struct file_operations reset_ops = { 
	.llseek = noop_llseek,

};



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

			  size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;



	return mac80211_format_buffer(user_buf, count, ppos, "%d\n",

				      local->wifi_wme_noack_test);

}



static ssize_t noack_write(struct file *file,

			   const char __user *user_buf,

			   size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	char buf[10];

	size_t len;



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

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

	buf[len] = '\0';



	local->wifi_wme_noack_test = !!simple_strtoul(buf, NULL, 0);



	return count;

}



static const struct file_operations noack_ops = {

	.read = noack_read,

	.write = noack_write,

	.open = mac80211_open_file_generic,

	.llseek = default_llseek,

};



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

				 size_t count, loff_t *ppos)

{
@@ -398,7 +364,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	DEBUGFS_ADD(wep_iv);

	DEBUGFS_ADD(queues);

	DEBUGFS_ADD_MODE(reset, 0200);

	DEBUGFS_ADD(noack);

	DEBUGFS_ADD(uapsd_queues);

	DEBUGFS_ADD(uapsd_max_sp_len);

	DEBUGFS_ADD(channel_type);

net/mac80211/ieee80211_i.h

+0 −1
Original line number Diff line number Diff line
@@ -961,7 +961,6 @@ struct ieee80211_local { 
	int total_ps_buffered; /* total number of all buffered unicast and

				* multicast packets for power saving stations

				*/

	int wifi_wme_noack_test;

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



	/*

net/mac80211/tx.c

+1 −9
Original line number Diff line number Diff line
@@ -1173,16 +1173,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, 
	if (is_multicast_ether_addr(hdr->addr1)) {

		tx->flags &= ~IEEE80211_TX_UNICAST;

		info->flags |= IEEE80211_TX_CTL_NO_ACK;

	} else {

	} else

		tx->flags |= IEEE80211_TX_UNICAST;

		if (unlikely(local->wifi_wme_noack_test))

			info->flags |= IEEE80211_TX_CTL_NO_ACK;

		/*

		 * Flags are initialized to 0. Hence, no need to

		 * explicitly unset IEEE80211_TX_CTL_NO_ACK since

		 * it might already be set for injected frames.

		 */

	}



	if (!(info->flags & IEEE80211_TX_CTL_DONTFRAG)) {

		if (!(tx->flags & IEEE80211_TX_UNICAST) ||

net/mac80211/wme.c

+1 −2
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata, 
		/* preserve EOSP bit */

		ack_policy = *p & IEEE80211_QOS_CTL_EOSP;



		if (unlikely(sdata->local->wifi_wme_noack_test) ||

		    is_multicast_ether_addr(hdr->addr1))

		if (is_multicast_ether_addr(hdr->addr1))

			ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK;

		/* qos header is 2 bytes */

		*p++ = ack_policy | tid;