diff options
| author | Brett Rudley | 2010-10-13 00:01:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-14 21:20:49 +0200 |
| commit | 4c71ebf4da809dd1379bbadfbc2683b77ecd932f (patch) | |
| tree | 85e415942ad09171631dbdbfaa949eaeda2c87ab /drivers/staging/brcm80211/sys | |
| parent | staging: speakup: fix printk format warning (diff) | |
| download | kernel-qcow2-linux-4c71ebf4da809dd1379bbadfbc2683b77ecd932f.tar.gz kernel-qcow2-linux-4c71ebf4da809dd1379bbadfbc2683b77ecd932f.tar.xz kernel-qcow2-linux-4c71ebf4da809dd1379bbadfbc2683b77ecd932f.zip | |
staging: brcm80211: Purge unused bcmwpa.[ch]
Move two macros into wlc_mac80211.h and purge the rest.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 1 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.h | 4 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_stf.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 4865c5e21d7e..1c413ed7c6ef 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/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/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index 602925fbb043..6a77591234b7 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/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/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c index 8bf428948613..a1db289a1209 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.c +++ b/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> |