diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-06-28 09:11:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-05 15:26:50 -0400 |
commit | 3bff1865186c6bb97855f0c13e3850543dce9cef (patch) | |
tree | 4a9150f82cbb83a01f8fb82b3bf2d69028230928 /net/mac80211/ieee80211_i.h | |
parent | 252e735d64880b011f6cdeb41ebcac2eaeb58fd3 (diff) |
mac80211: Skip tailroom reservation for full HW-crypto devices with race fix
Based on inputs from Johannes Berg <johannes@sipsolutions.net>
from http://article.gmane.org/gmane.linux.kernel.wireless.general/68193
and http://article.gmane.org/gmane.linux.kernel.wireless.general/71702
In xmit path, devices that do full hardware crypto (including
MMIC and ICV) need no tailroom. For such devices, tailroom
reservation can be skipped if all the keys are programmed into
the hardware (i.e software crypto is not used for any of the
keys) and none of the keys wants software to generate Michael
MIC and IV.
v2: Added check for IV along with MMIC.
Reported-by: Fabio Rossi <rossi.f@inwind.it>
Tested-by: Fabio Rossi <rossi.f@inwind.it>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Cc: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
v3: Fixing races to avoid WARNING: at net/mac80211/wpa.c:397
ccmp_encrypt_skb+0xc4/0x1f0
Reported-by: Andreas Hartmann <andihartmann@01019freenet.de>
Tested-by: Andreas Hartmann <andihartmann@01019freenet.de>
v4: Added links with message ID
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 25c15cc63319..4f2e424e8b1b 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -544,6 +544,9 @@ struct ieee80211_sub_if_data { | |||
544 | /* keys */ | 544 | /* keys */ |
545 | struct list_head key_list; | 545 | struct list_head key_list; |
546 | 546 | ||
547 | /* count for keys needing tailroom space allocation */ | ||
548 | int crypto_tx_tailroom_needed_cnt; | ||
549 | |||
547 | struct net_device *dev; | 550 | struct net_device *dev; |
548 | struct ieee80211_local *local; | 551 | struct ieee80211_local *local; |
549 | 552 | ||