---

yaml
---
r: 259421
b: refs/heads/master
c: a9cfc9b
h: refs/heads/master
i:
  259419: c3c3a47
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b745b6bb468ee308ac3b9884fd80e71f2bd8315a
+refs/heads/master: a9cfc9b0b5ce1e52a1486553a9dad82df0ef3755

trunk/drivers/staging/brcm80211/brcmsmac/alloc.c

@@ -25,7 +25,6 @@
 #include "types.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "alloc.h"
 #include "rate.h"
 #include "phy/phy_hal.h"

trunk/drivers/staging/brcm80211/brcmsmac/ampdu.c

@@ -26,7 +26,6 @@
 #include "rate.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "phy/phy_hal.h"
 #include "antsel.h"
 #include "channel.h"

trunk/drivers/staging/brcm80211/brcmsmac/antsel.c

@@ -26,7 +26,6 @@
 
 #include "d11.h"
 #include "rate.h"
-#include "key.h"
 #include "scb.h"
 #include "pub.h"
 #include "phy/phy_hal.h"

trunk/drivers/staging/brcm80211/brcmsmac/bottom_mac.c

@@ -38,7 +38,6 @@
 #include "rate.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"

trunk/drivers/staging/brcm80211/brcmsmac/channel.c

@@ -28,7 +28,6 @@
 #include "d11.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "phy/phy_hal.h"
 #include "bottom_mac.h"
 #include "rate.h"

trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c

@@ -34,7 +34,6 @@
 #include "phy/phy_int.h"
 #include "d11.h"
 #include "types.h"
-#include "key.h"
 #include "channel.h"
 #include "scb.h"
 #include "pub.h"

trunk/drivers/staging/brcm80211/brcmsmac/main.c

@@ -33,7 +33,6 @@
 #include "rate.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"
@@ -521,8 +520,6 @@ void wlc_init(struct wlc_info *wlc)
 		}
 	}
 
-	wlc_key_hw_init_all(wlc);
-
 	wlc_bandinit_ordered(wlc, chanspec);
 
 	wlc_init_scb(wlc, &global_scb);

trunk/drivers/staging/brcm80211/brcmsmac/main.h

@@ -297,6 +297,49 @@ struct wlc_stf {
 #define WLC_HT_WEP_RESTRICT	0x01	/* restrict HT with WEP */
 #define WLC_HT_TKIP_RESTRICT	0x02	/* restrict HT with TKIP */
 
+/* Maximum # of keys that wl driver supports in S/W.
+ * Keys supported in H/W is less than or equal to WSEC_MAX_KEYS.
+ */
+#define WSEC_MAX_KEYS		54	/* Max # of keys (50 + 4 default keys) */
+#define WLC_DEFAULT_KEYS	4	/* Default # of keys */
+
+/*
+* Max # of keys currently supported:
+*
+*     s/w keys if WSEC_SW(wlc->wsec).
+*     h/w keys otherwise.
+*/
+#define WLC_MAX_WSEC_KEYS(wlc) WSEC_MAX_KEYS
+
+/* number of 802.11 default (non-paired, group keys) */
+#define WSEC_MAX_DEFAULT_KEYS	4	/* # of default keys */
+
+typedef struct wsec_iv {
+	u32 hi;		/* upper 32 bits of IV */
+	u16 lo;		/* lower 16 bits of IV */
+} wsec_iv_t;
+
+#define WLC_NUMRXIVS	16	/* # rx IVs (one per 802.11e TID) */
+
+typedef struct wsec_key {
+	u8 ea[ETH_ALEN];	/* per station */
+	u8 idx;		/* key index in wsec_keys array */
+	u8 id;		/* key ID [0-3] */
+	u8 algo;		/* CRYPTO_ALGO_AES_CCM, CRYPTO_ALGO_WEP128, etc */
+	u8 rcmta;		/* rcmta entry index, same as idx by default */
+	u16 flags;		/* misc flags */
+	u8 algo_hw;		/* cache for hw register */
+	u8 aes_mode;		/* cache for hw register */
+	s8 iv_len;		/* IV length */
+	s8 icv_len;		/* ICV length */
+	u32 len;		/* key length..don't move this var */
+	/* data is 4byte aligned */
+	u8 data[WLAN_MAX_KEY_LEN];	/* key data */
+	wsec_iv_t rxiv[WLC_NUMRXIVS];	/* Rx IV (one per TID) */
+	wsec_iv_t txiv;		/* Tx IV */
+
+} wsec_key_t;
+
 /*
  * core state (mac)
  */

trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c

@@ -40,7 +40,6 @@
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "srom.h"
-#include "key.h"
 #include "bottom_mac.h"
 #include "phy_hal.h"
 #include "main.h"

trunk/drivers/staging/brcm80211/brcmsmac/stf.c

@@ -28,7 +28,6 @@
 #include "rate.h"
 #include "scb.h"
 #include "pub.h"
-#include "key.h"
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"