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

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

staging: brcm80211: structure renaming in dhd.h 



structure have been renamed for consistency and the structure typedefs
have been removed.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c1b52f62

drivers/staging/brcm80211/brcmfmac/dhd.h

+8 −8
Original line number Diff line number Diff line
@@ -595,19 +595,19 @@ typedef struct dhd_pub { 


} dhd_pub_t;



typedef struct dhd_if_event {

struct brcmf_if_event {

	u8 ifidx;

	u8 action;

	u8 flags;

	u8 bssidx;

} dhd_if_event_t;

};



typedef struct {

struct brcmf_timeout {

	u32 limit;		/* Expiration time (usec) */

	u32 increment;	/* Current expiration increment (usec) */

	u32 elapsed;		/* Current elapsed time (usec) */

	u32 tick;		/* O/S tick time (usec) */

} dhd_timeout_t;

};



typedef struct {

	uint event;
@@ -803,8 +803,8 @@ extern void brcmf_os_sdunlock_eventq(dhd_pub_t *pub); 
extern int brcmf_write_to_file(dhd_pub_t *dhd, u8 *buf, int size);

#endif				/* BCMDBG */



extern void brcmf_timeout_start(dhd_timeout_t *tmo, uint usec);

extern int brcmf_timeout_expired(dhd_timeout_t *tmo);

extern void brcmf_timeout_start(struct brcmf_timeout *tmo, uint usec);

extern int brcmf_timeout_expired(struct brcmf_timeout *tmo);



extern int brcmf_ifname2idx(struct dhd_info *dhd, char *name);

extern int brcmf_c_host_event(struct dhd_info *dhd, int *idx, void *pktdata,
@@ -843,7 +843,7 @@ extern void osl_assert(char *exp, char *file, int line); 
#endif  /* defined(BCMDBG) */



/* Linux network driver ioctl encoding */

typedef struct dhd_ioctl {

struct brcmf_c_ioctl {

	uint cmd;		/* common ioctl definition */

	void *buf;		/* pointer to user buffer */

	uint len;		/* length of user buffer */
@@ -851,7 +851,7 @@ typedef struct dhd_ioctl { 
	uint used;		/* bytes read or written (optional) */

	uint needed;		/* bytes needed (optional) */

	uint driver;		/* to identify target driver */

} dhd_ioctl_t;

};



/* per-driver magic numbers */

#define BRCMF_IOCTL_MAGIC		0x00444944

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+4 −2
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ brcmf_c_iovar_op(dhd_pub_t *drvr, const char *name, 
	return bcmerror;

}



int brcmf_c_ioctl(dhd_pub_t *drvr, dhd_ioctl_t *ioc, void *buf, uint buflen)

int brcmf_c_ioctl(dhd_pub_t *drvr, struct brcmf_c_ioctl *ioc, void *buf,

		  uint buflen)

{

	int bcmerror = 0;
@@ -790,7 +791,8 @@ brcmf_c_host_event(struct dhd_info *drvr_priv, int *ifidx, void *pktdata, 
	switch (type) {

	case BRCMF_E_IF:

		{

			dhd_if_event_t *ifevent = (dhd_if_event_t *) event_data;

			struct brcmf_if_event *ifevent =

					(struct brcmf_if_event *) event_data;

			DHD_TRACE(("%s: if event\n", __func__));



			if (ifevent->ifidx > 0 &&

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static void brcmf_late_resume(struct early_suspend *h) 
 *              fatal();

 */



void brcmf_timeout_start(dhd_timeout_t *tmo, uint usec)

void brcmf_timeout_start(struct brcmf_timeout *tmo, uint usec)

{

	tmo->limit = usec;

	tmo->increment = 0;
@@ -328,7 +328,7 @@ void brcmf_timeout_start(dhd_timeout_t *tmo, uint usec) 
	tmo->tick = 1000000 / HZ;

}



int brcmf_timeout_expired(dhd_timeout_t *tmo)

int brcmf_timeout_expired(struct brcmf_timeout *tmo)

{

	/* Does nothing the first call */

	if (tmo->increment == 0) {
@@ -1197,7 +1197,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr, 
				    int cmd)

{

	dhd_info_t *drvr_priv = *(dhd_info_t **) netdev_priv(net);

	dhd_ioctl_t ioc;

	struct brcmf_c_ioctl ioc;

	int bcmerror = 0;

	int buflen = 0;

	void *buf = NULL;

drivers/staging/brcm80211/brcmfmac/dhd_proto.h

+3 −3
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ extern void brcmf_proto_dump(dhd_pub_t *dhdp, struct brcmu_strbuf *strbuf); 
/* Update local copy of dongle statistics */

extern void brcmf_proto_dstats(dhd_pub_t *dhdp);



extern int brcmf_c_ioctl(dhd_pub_t *dhd_pub, dhd_ioctl_t *ioc, void *buf,

		     uint buflen);

extern int brcmf_c_ioctl(dhd_pub_t *dhd_pub, struct brcmf_c_ioctl *ioc,

			 void *buf, uint buflen);



extern int brcmf_c_preinit_ioctls(dhd_pub_t *dhd);

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -3130,7 +3130,7 @@ void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex) 
int brcmf_sdbrcm_bus_init(dhd_pub_t *dhdp, bool enforce_mutex)

{

	dhd_bus_t *bus = dhdp->bus;

	dhd_timeout_t tmo;

	struct brcmf_timeout tmo;

	uint retries = 0;

	u8 ready, enable;

	int err, ret = 0;