Commit 893d73f4 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

mac80211: Allow noack flag overwrite for injected frames 



Allow injected unicast frames to be sent without having to wait
for an ACK.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a5abbcb2

include/net/ieee80211_radiotap.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ enum ieee80211_radiotap_type { 
						 * retries */

#define IEEE80211_RADIOTAP_F_TX_CTS	0x0002	/* used cts 'protection' */

#define IEEE80211_RADIOTAP_F_TX_RTS	0x0004	/* used rts/cts handshake */

#define IEEE80211_RADIOTAP_F_TX_NOACK	0x0008	/* don't expect an ack */





/* For IEEE80211_RADIOTAP_MCS */

net/mac80211/tx.c

+13 −2
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len,

						   NULL);

	u16 txflags;



	info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	tx->flags &= ~IEEE80211_TX_FRAGMENTED;
@@ -1102,6 +1103,13 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx, 
				tx->flags |= IEEE80211_TX_FRAGMENTED;

			break;



		case IEEE80211_RADIOTAP_TX_FLAGS:

			txflags = le16_to_cpu(get_unaligned((__le16*)

						iterator.this_arg));

			if (txflags & IEEE80211_RADIOTAP_F_TX_NOACK)

				info->flags |= IEEE80211_TX_CTL_NO_ACK;

			break;



		/*

		 * Please update the file

		 * Documentation/networking/mac80211-injection.txt
@@ -1266,8 +1274,11 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, 
		tx->flags |= IEEE80211_TX_UNICAST;

		if (unlikely(local->wifi_wme_noack_test))

			info->flags |= IEEE80211_TX_CTL_NO_ACK;

		else

			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 (tx->flags & IEEE80211_TX_FRAGMENTED) {