diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-16 14:46:45 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 14:57:54 -0400 |
commit | 18ad01c43918751cc22f8ee28f6b38b8954a55b2 (patch) | |
tree | 4d6812474ed14313bbe7796972ef7e5b0db8a527 /drivers/net/wireless/rt2x00/rt2x00mac.c | |
parent | a538e2d5a30f577e9c8f6ccfe72b29a258e0fe86 (diff) |
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index c4c06b4e1f08..475a3ed76468 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -73,7 +73,8 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, | |||
73 | else | 73 | else |
74 | rts_info->flags &= ~IEEE80211_TX_CTL_NO_ACK; | 74 | rts_info->flags &= ~IEEE80211_TX_CTL_NO_ACK; |
75 | 75 | ||
76 | skb->do_not_encrypt = 1; | 76 | /* Disable hardware encryption */ |
77 | rts_info->control.hw_key = NULL; | ||
77 | 78 | ||
78 | /* | 79 | /* |
79 | * RTS/CTS frame should use the length of the frame plus any | 80 | * RTS/CTS frame should use the length of the frame plus any |