1 files changed, 0 insertions, 9 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 652dced0f3ec..a2c14f95b9a0 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -189,7 +189,6 @@ struct ieee80211_tx_control {
 #define IEEE80211_TXCTL_REQUEUE         (1<<7)
 #define IEEE80211_TXCTL_FIRST_FRAGMENT  (1<<8) /* this is a first fragment of
                                                 * the frame */
-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
 #define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
                                                   * using the through
                                                   * set_retry_limit configured
@@ -205,7 +204,6 @@ struct ieee80211_tx_control {
         u8 antenna_sel_tx;      /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
         u8 icv_len;             /* length of the ICV/MIC field in octets */
         u8 iv_len;              /* length of the IV field in octets */
-        u8 tkip_key[16];        /* generated phase2/phase1 key for hw TKIP */
         u8 queue;               /* hardware queue to use for this frame;
                                  * 0 = highest, hw->queues-1 = lowest */
         u8 sw_retry_attempt;    /* number of times hw has tried to
@@ -565,13 +563,6 @@ struct ieee80211_hw {
          * specified in the device's EEPROM */
 #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
 
-        /* Do TKIP phase1 key mixing in stack to support cards only do
-         * phase2 key mixing when doing hwcrypto */
-#define IEEE80211_HW_TKIP_REQ_PHASE1_KEY (1<<13)
-        /* Do TKIP phase1 and phase2 key mixing in stack and send the generated
-         * per-packet RC4 key with each TX frame when doing hwcrypto */
-#define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
-
         u32 flags;                      /* hardware flags defined above */
 
         /* Set to the size of a needed device specific skb headroom for TX skbs. */