aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-10-23 02:21:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-08 15:54:27 -0500
commit077a9154898b374f20555adc3f620cccd02581d6 (patch)
tree77549521a0633899874a2b7f694f240cd7e61414 /include
parent3b7b72eed19684824806b3fbefef653a180ef2b0 (diff)
mac80211: support adding IV-room in the skb for CCMP keys
Some cards can generate CCMP IVs in HW, but require the space for the IV to be pre-allocated in the frame at the correct offset. Add a key flag that allows us to achieve this. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index dc1123aa8181..f4e0ab49db20 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -901,6 +901,10 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
901 * @IEEE80211_KEY_FLAG_SW_MGMT: This flag should be set by the driver for a 901 * @IEEE80211_KEY_FLAG_SW_MGMT: This flag should be set by the driver for a
902 * CCMP key if it requires CCMP encryption of management frames (MFP) to 902 * CCMP key if it requires CCMP encryption of management frames (MFP) to
903 * be done in software. 903 * be done in software.
904 * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver
905 * for a CCMP key if space should be prepared for the IV, but the IV
906 * itself should not be generated. Do not set together with
907 * @IEEE80211_KEY_FLAG_GENERATE_IV on the same key.
904 */ 908 */
905enum ieee80211_key_flags { 909enum ieee80211_key_flags {
906 IEEE80211_KEY_FLAG_WMM_STA = 1<<0, 910 IEEE80211_KEY_FLAG_WMM_STA = 1<<0,
@@ -908,6 +912,7 @@ enum ieee80211_key_flags {
908 IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2, 912 IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2,
909 IEEE80211_KEY_FLAG_PAIRWISE = 1<<3, 913 IEEE80211_KEY_FLAG_PAIRWISE = 1<<3,
910 IEEE80211_KEY_FLAG_SW_MGMT = 1<<4, 914 IEEE80211_KEY_FLAG_SW_MGMT = 1<<4,
915 IEEE80211_KEY_FLAG_PUT_IV_SPACE = 1<<5,
911}; 916};
912 917
913/** 918/**