diff options
author | Roland Vossen <rvossen@broadcom.com> | 2011-06-09 18:44:41 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-29 00:02:37 +0400 |
commit | 939e1ef5d92920b2056c5d63618c8f998ae942e9 (patch) | |
tree | 3578d4bfe1de8c10dab7c40a25fda600fe302e9a /drivers/staging/brcm80211/brcmsmac/main.h | |
parent | dc5a18941b4226846f0c5994e4f45bc685f7bcfe (diff) | |
download | linux-939e1ef5d92920b2056c5d63618c8f998ae942e9.tar.xz |
staging: brcm80211: moved typedefs to decrease header file dependencies
Code cleanup. Moved the typedefs to brcmsmac/types.h for source files that
only require opaque pointer definitions. Next patches will decrease the
number of #includes for each file.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/main.h')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.h b/drivers/staging/brcm80211/brcmsmac/main.h index c41205a5ce44..0065a407f6c1 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.h +++ b/drivers/staging/brcm80211/brcmsmac/main.h @@ -314,14 +314,14 @@ struct wlc_stf { /* number of 802.11 default (non-paired, group keys) */ #define WSEC_MAX_DEFAULT_KEYS 4 /* # of default keys */ -typedef struct wsec_iv { +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 { +struct wsec_key { u8 ea[ETH_ALEN]; /* per station */ u8 idx; /* key index in wsec_keys array */ u8 id; /* key ID [0-3] */ @@ -337,8 +337,7 @@ typedef struct wsec_key { 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) @@ -424,7 +423,6 @@ struct edcf_acparam { u8 ECW; u16 TXOP; } __attribute__((packed)); -typedef struct edcf_acparam edcf_acparam_t; struct wme_param_ie { u8 oui[3]; @@ -435,7 +433,6 @@ struct wme_param_ie { u8 rsvd; edcf_acparam_t acparam[AC_COUNT]; } __attribute__((packed)); -typedef struct wme_param_ie wme_param_ie_t; /* virtual interface */ struct wlc_if { |