Merge branch 'cleanups'

Merge cleanups requested by Linus.

* cleanups: (3 commits)
  pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_mark_request_commit
  nfs: Can call nfs_clear_page_commit() instead
  nfs: Provide and use helper functions for marking a page as unstable

1 files changed, 18 insertions, 0 deletions

diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 19db68663d75..d57a9915494f 100644
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -95,6 +95,24 @@ struct ieee80211_key {
                         u32 icverrors; /* dot11RSNAStatsCMACICVErrors */
                 } aes_cmac;
                 struct {
+                        atomic64_t tx_pn;
+                        u8 rx_pn[IEEE80211_GMAC_PN_LEN];
+                        struct crypto_aead *tfm;
+                        u32 replays; /* dot11RSNAStatsCMACReplays */
+                        u32 icverrors; /* dot11RSNAStatsCMACICVErrors */
+                } aes_gmac;
+                struct {
+                        atomic64_t tx_pn;
+                        /* Last received packet number. The first
+                         * IEEE80211_NUM_TIDS counters are used with Data
+                         * frames and the last counter is used with Robust
+                         * Management frames.
+                         */
+                        u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_GCMP_PN_LEN];
+                        struct crypto_aead *tfm;
+                        u32 replays; /* dot11RSNAStatsGCMPReplays */
+                } gcmp;
+                struct {
                         /* generic cipher scheme */
                         u8 rx_pn[IEEE80211_NUM_TIDS + 1][MAX_PN_LEN];
                 } gen;