From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 14 Sep 2015 11:56:17 +0000 (+0200)
Subject: Revert "mac80211: add pointer for driver use to key"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5359d112dcb081fd7a5f2de287fa995f6ba0800c;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Revert "mac80211: add pointer for driver use to key"

This reverts commit f9a060f4b2003eb7350762e60dfc576447e44bad.

No driver has turned up needing this functionality, and I've just
implemented the functionality I wanted this for in a different
way. Thus, remove it again, until somebody shows up with a need
for having it.

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

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d62d6f41548b..3424ac6efb2a 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1497,10 +1497,8 @@ enum ieee80211_key_flags {
  * 	- Temporal Authenticator Rx MIC Key (64 bits)
  * @icv_len: The ICV length for this key type
  * @iv_len: The IV length for this key type
- * @drv_priv: pointer for driver use
  */
 struct ieee80211_key_conf {
-	void *drv_priv;
 	atomic64_t tx_pn;
 	u32 cipher;
 	u8 icv_len;