4 files changed, 2 insertions, 47 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 00cefcb493eb..90baea53e7c5 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -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);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 762243e469df..b1aa2e172d1d 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -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)) */
 
         /*
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8d31933abe6a..205fdcb70fff 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -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) ||
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 43327115b490..74b3d1008445 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -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;