Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / mac80211 / key.h

diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 9951ef06323e743d2c33156d15e5a21478584cd9..4aa20cef08595955702cd0aa5746d2dde1e56647 100644 (file)
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -44,13 +44,17 @@ enum ieee80211_internal_tkip_state {
 };
 
 struct tkip_ctx {
-       u32 iv32;       /* current iv32 */
-       u16 iv16;       /* current iv16 */
        u16 p1k[5];     /* p1k cache */
        u32 p1k_iv32;   /* iv32 for which p1k computed */
        enum ieee80211_internal_tkip_state state;
 };
 
+struct tkip_ctx_rx {
+       struct tkip_ctx ctx;
+       u32 iv32;       /* current iv32 */
+       u16 iv16;       /* current iv16 */
+};
+
 struct ieee80211_key {
        struct ieee80211_local *local;
        struct ieee80211_sub_if_data *sdata;
@@ -71,7 +75,7 @@ struct ieee80211_key {
                        struct tkip_ctx tx;
 
                        /* last received RSC */
-                       struct tkip_ctx rx[IEEE80211_NUM_TIDS];
+                       struct tkip_ctx_rx rx[IEEE80211_NUM_TIDS];
 
                        /* number of mic failures */
                        u32 mic_failures;