lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: remove skb->do_not_encrypt usage

Browse Source 
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2009-06-16 20:46:45 +02:00
committed by John W. Linville
parent a538e2d5a3
commit 18ad01c439
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/rt2x00/rt2x00crypto.c
View File

@@ -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_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !hw_key)
!hw_key || entry->skb->do_not_encrypt)
return; return;
__set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags); __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; struct ieee80211_key_conf *key = tx_info->control.hw_key;
unsigned int overhead = 0; unsigned int overhead = 0;
if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !key)
!key || skb->do_not_encrypt)
return overhead; return overhead;
/* /*

3
drivers/net/wireless/rt2x00/rt2x00mac.c
View File

@@ -73,7 +73,8 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
else else
rts_info->flags &= ~IEEE80211_TX_CTL_NO_ACK; 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 * RTS/CTS frame should use the length of the frame plus any