diff options
| author | Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2011-11-18 14:20:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-28 20:34:15 +0100 |
| commit | 6fd67e937ece538e0ab766df96a9895e6fd622df (patch) | |
| tree | c3c09e2d08d59f9de71d059a89a09b0716e11705 /net/mac80211/tx.c | |
| parent | rtlwifi: squash warning in _usb_read_sync (diff) | |
| download | linux-6fd67e937ece538e0ab766df96a9895e6fd622df.tar.xz linux-6fd67e937ece538e0ab766df96a9895e6fd622df.zip | |
mac80211: remove debugfs noack test
This feature has been superseded by the NoAck per Queue feature.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 10 |
1 files changed, 1 insertions, 9 deletions
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) || |