Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 824090ef authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove unused type definitions from driver 



Quite some definitions are not referenced in the drivers sources and
clutter up the files so they are removed.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 93ed8e35

drivers/staging/brcm80211/brcmfmac/dhd.h

+2 −9
Original line number Diff line number Diff line
@@ -49,13 +49,6 @@ enum dhd_bus_state { 
	DHD_BUS_DATA		/* Ready for frame transfers */

};



enum dhd_prealloc_index {

	DHD_PREALLOC_PROT = 0,

	DHD_PREALLOC_RXBUF,

	DHD_PREALLOC_DATABUF,

	DHD_PREALLOC_OSL_BUF

};



/* Common structure for module and instance linkage */

typedef struct dhd_pub {

	/* Linkage ponters */
@@ -332,12 +325,12 @@ extern int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag); 
extern uint dhd_bus_status(dhd_pub_t *dhdp);

extern int dhd_bus_start(dhd_pub_t *dhdp);



typedef enum cust_gpio_modes {

enum cust_gpio_modes {

	WLAN_RESET_ON,

	WLAN_RESET_OFF,

	WLAN_POWER_ON,

	WLAN_POWER_OFF

} cust_gpio_modes_t;

};

/*

 * Insmod parameters for debug/test

 */

drivers/staging/brcm80211/brcmfmac/hndrte_cons.h

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#ifndef _hndrte_cons_h

#define _hndrte_cons_h



#define CBUF_LEN	(128)
@@ -55,3 +57,6 @@ typedef struct { 
	uint cbuf_idx;

	char cbuf[CBUF_LEN];

} hndrte_cons_t;



#endif /* _hndrte_cons_h */

drivers/staging/brcm80211/brcmfmac/wl_iw.h

+0 −6
Original line number Diff line number Diff line
@@ -139,10 +139,4 @@ extern int dhd_dev_get_pno_status(struct net_device *dev); 
#define PNO_TLV_TYPE_TIME		'T'

#define  PNO_EVENT_UP			"PNO_EVENT"



typedef struct cmd_tlv {

	char prefix;

	char version;

	char subver;

	char reserved;

} cmd_tlv_t;

#endif				/* _wl_iw_h_ */

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+0 −30
Original line number Diff line number Diff line
@@ -68,36 +68,6 @@ static int wl_linux_watchdog(void *ctx); 


static int wl_found;



struct ieee80211_tkip_data {

#define TKIP_KEY_LEN 32

	u8 key[TKIP_KEY_LEN];

	int key_set;



	u32 tx_iv32;

	u16 tx_iv16;

	u16 tx_ttak[5];

	int tx_phase1_done;



	u32 rx_iv32;

	u16 rx_iv16;

	u16 rx_ttak[5];

	int rx_phase1_done;

	u32 rx_iv32_new;

	u16 rx_iv16_new;



	u32 dot11RSNAStatsTKIPReplays;

	u32 dot11RSNAStatsTKIPICVErrors;

	u32 dot11RSNAStatsTKIPLocalMICFailures;



	int key_idx;



	struct crypto_tfm *tfm_arc4;

	struct crypto_tfm *tfm_michael;



	/* scratch buffers for virt_to_page() (crypto API) */

	u8 rx_hdr[16], tx_hdr[16];

};



#define WL_DEV_IF(dev)		((struct wl_if *)netdev_priv(dev))

#define	WL_INFO(dev)		((struct wl_info *)(WL_DEV_IF(dev)->wl))

static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev);

drivers/staging/brcm80211/brcmsmac/wl_mac80211.h

+0 −9
Original line number Diff line number Diff line
@@ -37,15 +37,6 @@ typedef struct wl_timer { 
#endif

} wl_timer_t;



/* contortion to call functions at safe time */

/* In 2.6.20 kernels work functions get passed a pointer to the struct work, so things

 * will continue to work as long as the work structure is the first component of the task structure.

 */

typedef struct wl_task {

	struct work_struct work;

	void *context;

} wl_task_t;



struct wl_if {

	uint subunit;		/* WDS/BSS unit */

	struct pci_dev *pci_dev;