---

yaml --- r: 220327 b: refs/heads/master c: 4c71ebf h: refs/heads/master i: 220325: 8bc827d 220323: 28835c9 220319: 00a53d3 v: v3
git-mirror · Oct 14, 2010 · 7532d88 · 7532d88
1 parent c31d201
commit 7532d88
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 146 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a652b96287ef61c97a2acab2bcc3d0f319b50e4
+refs/heads/master: 4c71ebf4da809dd1379bbadfbc2683b77ecd932f
diff --git a/trunk/drivers/staging/brcm80211/Makefile b/trunk/drivers/staging/brcm80211/Makefile
@@ -38,7 +38,6 @@ BRCM80211_OFILES := \
 	util/bcmsrom.o \
 	util/bcmutils.o \
 	util/bcmwifi.o \
-	util/bcmwpa.o \
 	util/hndpmu.o \
 	util/linux_osl.o \
 	sys/wlc_alloc.o \

diff --git a/trunk/drivers/staging/brcm80211/include/bcmwpa.h b/trunk/drivers/staging/brcm80211/include/bcmwpa.h
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -30,7 +30,6 @@
 #include <bcmsrom.h>
 #include <wlioctl.h>
 #include <epivers.h>
-#include <bcmwpa.h>
 #include <sbhnddma.h>
 #include <hnddma.h>
 #include <hndpmu.h>

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -117,6 +117,10 @@ typedef struct wlc_bss_list {
 
 /* if wpa is in use then portopen is true when the group key is plumbed otherwise it is always true
  */
+#define WSEC_ENABLED(wsec) ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED))
+#define WLC_SW_KEYS(wlc, bsscfg) ((((wlc)->wsec_swkeys) || \
+	((bsscfg)->wsec & WSEC_SWFLAG)))
+
 #define WLC_PORTOPEN(cfg) \
 	(((cfg)->WPA_auth != WPA_AUTH_DISABLED && WSEC_ENABLED((cfg)->wsec)) ? \
 	(cfg)->wsec_portopen : true)

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_stf.c b/trunk/drivers/staging/brcm80211/sys/wlc_stf.c
@@ -25,7 +25,6 @@
 #include <bcmendian.h>
 #include <proto/802.11.h>
 #include <wlioctl.h>
-#include <bcmwpa.h>
 #include <bcmwifi.h>
 #include <d11.h>
 #include <wlc_rate.h>

diff --git a/trunk/drivers/staging/brcm80211/util/bcmwpa.c b/trunk/drivers/staging/brcm80211/util/bcmwpa.c