aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
diff options
context:
space:
mode:
authorHante Meuleman <meuleman@broadcom.com>2012-11-14 21:46:23 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-16 14:29:05 -0500
commitb87e2c482510d56563873827783046a8eece5829 (patch)
treea88eb85c309040293af7244bcbb2d161a1be503a /drivers/net/wireless/brcm80211/brcmfmac/dhd.h
parent5a7a59d254b27ab90ba49dbae51cadc4775b3150 (diff)
brcmfmac: code cleanup
Removing obsolete functions and prototypes. Moving (and renaming) defines to place with similar definitions. Removing unnecessary includes. Reviewed-by: Arend Van Spriel <arend@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd.h')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd.h20
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 499c5c240e04..24bc4e3e162b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -40,8 +40,11 @@
40#define BRCMF_C_GET_SSID 25 40#define BRCMF_C_GET_SSID 25
41#define BRCMF_C_SET_SSID 26 41#define BRCMF_C_SET_SSID 26
42#define BRCMF_C_GET_CHANNEL 29 42#define BRCMF_C_GET_CHANNEL 29
43#define BRCMF_C_SET_CHANNEL 30
43#define BRCMF_C_GET_SRL 31 44#define BRCMF_C_GET_SRL 31
45#define BRCMF_C_SET_SRL 32
44#define BRCMF_C_GET_LRL 33 46#define BRCMF_C_GET_LRL 33
47#define BRCMF_C_SET_LRL 34
45#define BRCMF_C_GET_RADIO 37 48#define BRCMF_C_GET_RADIO 37
46#define BRCMF_C_SET_RADIO 38 49#define BRCMF_C_SET_RADIO 38
47#define BRCMF_C_GET_PHYTYPE 39 50#define BRCMF_C_GET_PHYTYPE 39
@@ -60,6 +63,7 @@
60#define BRCMF_C_SET_COUNTRY 84 63#define BRCMF_C_SET_COUNTRY 84
61#define BRCMF_C_GET_PM 85 64#define BRCMF_C_GET_PM 85
62#define BRCMF_C_SET_PM 86 65#define BRCMF_C_SET_PM 86
66#define BRCMF_C_GET_CURR_RATESET 114
63#define BRCMF_C_GET_AP 117 67#define BRCMF_C_GET_AP 117
64#define BRCMF_C_SET_AP 118 68#define BRCMF_C_SET_AP 118
65#define BRCMF_C_GET_RSSI 127 69#define BRCMF_C_GET_RSSI 127
@@ -67,6 +71,7 @@
67#define BRCMF_C_SET_WSEC 134 71#define BRCMF_C_SET_WSEC 134
68#define BRCMF_C_GET_PHY_NOISE 135 72#define BRCMF_C_GET_PHY_NOISE 135
69#define BRCMF_C_GET_BSS_INFO 136 73#define BRCMF_C_GET_BSS_INFO 136
74#define BRCMF_C_GET_PHYLIST 180
70#define BRCMF_C_SET_SCAN_CHANNEL_TIME 185 75#define BRCMF_C_SET_SCAN_CHANNEL_TIME 185
71#define BRCMF_C_SET_SCAN_UNASSOC_TIME 187 76#define BRCMF_C_SET_SCAN_UNASSOC_TIME 187
72#define BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON 201 77#define BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON 201
@@ -102,16 +107,8 @@
102#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff 107#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff
103#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16 108#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16
104 109
105/* Indicates this key is using soft encrypt */
106#define WL_SOFT_KEY (1 << 0)
107/* primary (ie tx) key */ 110/* primary (ie tx) key */
108#define BRCMF_PRIMARY_KEY (1 << 1) 111#define BRCMF_PRIMARY_KEY (1 << 1)
109/* Reserved for backward compat */
110#define WL_KF_RES_4 (1 << 4)
111/* Reserved for backward compat */
112#define WL_KF_RES_5 (1 << 5)
113/* Indicates a group key for a IBSS PEER */
114#define WL_IBSS_PEER_GROUP_KEY (1 << 6)
115 112
116/* For supporting multiple interfaces */ 113/* For supporting multiple interfaces */
117#define BRCMF_MAX_IFS 16 114#define BRCMF_MAX_IFS 16
@@ -286,7 +283,7 @@ struct brcm_rateset_le {
286 /* # rates in this set */ 283 /* # rates in this set */
287 __le32 count; 284 __le32 count;
288 /* rates in 500kbps units w/hi bit set if basic */ 285 /* rates in 500kbps units w/hi bit set if basic */
289 u8 rates[WL_NUMRATES]; 286 u8 rates[BRCMF_MAXRATES_IN_SET];
290}; 287};
291 288
292struct brcmf_ssid { 289struct brcmf_ssid {
@@ -580,11 +577,6 @@ extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
580extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 577extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
581 void *buf, uint len); 578 void *buf, uint len);
582 579
583extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);
584extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,
585 void *pktdata, struct brcmf_event_msg *,
586 void **data_ptr);
587
588extern int brcmf_net_attach(struct brcmf_if *ifp); 580extern int brcmf_net_attach(struct brcmf_if *ifp);
589extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, 581extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx,
590 s32 bssidx, char *name, u8 *mac_addr); 582 s32 bssidx, char *name, u8 *mac_addr);