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

Commit 18ad01c4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

rt2x00: remove skb->do_not_encrypt usage 



Johannes is trying to get rid of the master netdev and in the process will
remove skb->do_not_encrypt field. This removes the do_not_encrypt
usage from rt2x00 to make the change easier.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a538e2d5

drivers/net/wireless/rt2x00/rt2x00crypto.c

+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry, 
	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;



	if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) ||

	    !hw_key || entry->skb->do_not_encrypt)

	if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !hw_key)

		return;



	__set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags);
@@ -82,8 +81,7 @@ unsigned int rt2x00crypto_tx_overhead(struct rt2x00_dev *rt2x00dev, 
	struct ieee80211_key_conf *key = tx_info->control.hw_key;

	unsigned int overhead = 0;



	if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) ||

	    !key || skb->do_not_encrypt)

	if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !key)

		return overhead;



	/*

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, 
	else

		rts_info->flags &= ~IEEE80211_TX_CTL_NO_ACK;



	skb->do_not_encrypt = 1;

	/* Disable hardware encryption */

	rts_info->control.hw_key = NULL;



	/*

	 * RTS/CTS frame should use the length of the frame plus any