summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-04-20 19:21:58 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-05-06 14:30:00 +0300
commita31cf1c69e89e0c2d5515b04aca313f1014a714d (patch)
tree97dc2ba14c14bdfaf26624590ecd8d773a78a07a /include/net
parent9352c19f639354f093cb5457315c01bcb94aa82a (diff)
downloadlinux-a31cf1c69e89e0c2d5515b04aca313f1014a714d.tar.xz
mac80211: extend get_key() to return PN for all ciphers
For ciphers not supported by mac80211, the function currently doesn't return any PN data. Fix this by extending the driver's get_key_seq() a little more to allow moving arbitrary PN data. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 47b39c26fc05..67e0df14ba0f 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1501,6 +1501,8 @@ struct ieee80211_key_conf {
u8 key[0];
};
+#define IEEE80211_MAX_PN_LEN 16
+
/**
* struct ieee80211_key_seq - key sequence counter
*
@@ -1513,6 +1515,7 @@ struct ieee80211_key_conf {
* reverse order than in packet)
* @gcmp: PN data, most significant byte first (big endian,
* reverse order than in packet)
+ * @hw: data for HW-only (e.g. cipher scheme) keys
*/
struct ieee80211_key_seq {
union {
@@ -1532,6 +1535,10 @@ struct ieee80211_key_seq {
struct {
u8 pn[6];
} gcmp;
+ struct {
+ u8 seq[IEEE80211_MAX_PN_LEN];
+ u8 seq_len;
+ } hw;
};
};