mac80211: extend get_tkip_seq to all keys

Extend the function to read the TKIP IV32/IV16 to read the IV/PN for
all ciphers in order to allow drivers with full hardware crypto to
properly support this.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 26e1ca8a474a..c01e681b90fb 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -417,12 +417,13 @@ static inline int drv_get_stats(struct ieee80211_local *local,
         return ret;
 }
 
-static inline void drv_get_tkip_seq(struct ieee80211_local *local,
-                                    u8 hw_key_idx, u32 *iv32, u16 *iv16)
+static inline void drv_get_key_seq(struct ieee80211_local *local,
+                                   struct ieee80211_key *key,
+                                   struct ieee80211_key_seq *seq)
 {
-        if (local->ops->get_tkip_seq)
-                local->ops->get_tkip_seq(&local->hw, hw_key_idx, iv32, iv16);
-        trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
+        if (local->ops->get_key_seq)
+                local->ops->get_key_seq(&local->hw, &key->conf, seq);
+        trace_drv_get_key_seq(local, &key->conf);
 }
 
 static inline int drv_set_frag_threshold(struct ieee80211_local *local,