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

Commit 1f660b9c authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed occurrences of 'dhd' 



DHD is a Broadcom internal term and has been replaced by BRCMF.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8fbc6dda

drivers/staging/brcm80211/brcmfmac/dhd.h

+11 −15
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 * Common types *

 */



#ifndef _dhd_h_

#define _dhd_h_

#ifndef _BRCMF_H_

#define _BRCMF_H_



#define BRCMF_VERSION_STR		"4.218.248.5"
@@ -310,10 +310,10 @@ struct brcmf_event { 
#define BRCMF_E_LINK_BSSCFG_DIS			4



/* The level of bus communication with the dongle */

enum dhd_bus_state {

	DHD_BUS_DOWN,		/* Not ready for frame transfers */

	DHD_BUS_LOAD,		/* Download access only (CPU reset) */

	DHD_BUS_DATA		/* Ready for frame transfers */

enum brcmf_bus_state {

	BRCMF_BUS_DOWN,		/* Not ready for frame transfers */

	BRCMF_BUS_LOAD,		/* Download access only (CPU reset) */

	BRCMF_BUS_DATA		/* Ready for frame transfers */

};



/* Pattern matching filter. Specifies an offset within received packets to
@@ -533,12 +533,12 @@ struct brcmf_pub { 
	struct brcmf_proto *prot;

	struct brcmf_info *info;



	/* Internal dhd items */

	/* Internal brcmf items */

	bool up;		/* Driver up/down (to OS) */

	bool txoff;		/* Transmit flow-controlled */

	bool dongle_reset;	/* true = DEVRESET put dongle into reset */

	enum dhd_bus_state busstate;

	uint hdrlen;		/* Total DHD header length (proto + bus) */

	enum brcmf_bus_state busstate;

	uint hdrlen;		/* Total BRCMF header length (proto + bus) */

	uint maxctl;		/* Max size rxctl request from proto to bus */

	uint rxsz;		/* Rx buffer size bus module should use */

	u8 wme_dp;		/* wme discard priority */
@@ -564,7 +564,7 @@ struct brcmf_pub { 
	unsigned long rx_dropped;	/* Packets dropped locally (no memory) */

	unsigned long rx_flushed;	/* Packets flushed due to

				unscheduled sendup thread */

	unsigned long wd_dpc_sched;	/* Number of times dhd dpc scheduled by

	unsigned long wd_dpc_sched;	/* Number of times dpc scheduled by

					 watchdog timer */



	unsigned long rx_readahead_cnt;	/* Number of packets where header read-ahead
@@ -744,10 +744,6 @@ static inline void MUTEX_UNLOCK_WL_SCAN_SET(void) 
{

}



/*

 * Exported from dhd OS modules (dhd_linux/dhd_ndis)

 */



/* Indication from bus module regarding presence/insertion of dongle.

 * Return struct brcmf_pub pointer, used as handle to OS module in later calls.

 * Returned structure should have bus and prot pointers filled in.
@@ -902,4 +898,4 @@ struct brcmf_pktgen { 
#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change

				 when idle */



#endif				/* _dhd_h_ */
 
#endif				/* _BRCMF_H_ */

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+4 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef _dhd_bus_h_

#define _dhd_bus_h_

#ifndef _BRCMF_BUS_H_

#define _BRCMF_BUS_H_



/* Packet alignment for most efficient SDIO (can change based on platform) */

#ifndef BRCMF_SDALIGN
@@ -26,7 +26,7 @@ 
#endif



/*

 * Exported from dhd bus module (dhd_usb, dhd_sdio)

 * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

 */



/* Watchdog timer interval */
@@ -68,4 +68,4 @@ extern void brcmf_bus_clearcounts(struct brcmf_pub *drvr); 


extern void brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick);



#endif				/* _dhd_bus_h_ */
 
#endif				/* _BRCMF_BUS_H_ */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+3 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct brcmf_proto_bdc_header { 


#define RETRIES 2	/* # of retries to retrieve matching ioctl response */

#define BUS_HEADER_LEN	(16+BRCMF_SDALIGN) /* Must be atleast SDPCM_RESERVE

					 * defined in dhd_sdio.c

					 * (amount of header tha might be added)

					 * plus any space that might be needed

					 * for alignment padding.
@@ -176,8 +175,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, 


	ret = brcmf_proto_cdc_msg(drvr);

	if (ret < 0) {

		DHD_ERROR(("dhdcdc_query_ioctl: dhdcdc_msg failed w/status "

			"%d\n", ret));

		DHD_ERROR(("brcmf_proto_cdc_query_ioctl: brcmf_proto_cdc_msg "

			   "failed w/status %d\n", ret));

		goto done;

	}
@@ -280,7 +279,7 @@ brcmf_proto_ioctl(struct brcmf_pub *drvr, int ifidx, struct brcmf_ioctl *ioc, 
	struct brcmf_proto *prot = drvr->prot;

	int ret = -1;



	if (drvr->busstate == DHD_BUS_DOWN) {

	if (drvr->busstate == BRCMF_BUS_DOWN) {

		DHD_ERROR(("%s : bus is down. we have nothing to do\n",

			   __func__));

		return ret;

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int brcmf_c_dump(struct brcmf_pub *drvr, char *buf, int buflen) 


	brcmu_binit(strbuf, buf, buflen);



	/* Base DHD info */

	/* Base info */

	brcmu_bprintf(strbuf, "%s\n", brcmf_version);

	brcmu_bprintf(strbuf, "\n");

	brcmu_bprintf(strbuf, "pub.up %d pub.txoff %d pub.busstate %d\n",
@@ -672,7 +672,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 
			if (hdr.version != MSGTRACE_VERSION) {

				DHD_ERROR(

				    ("\nMACEVENT: %s [unsupported version --> "

				     "dhd version:%d dongle version:%d]\n",

				     "brcmf version:%d dongle version:%d]\n",

				     event_name, MSGTRACE_VERSION, hdr.version)

				);

				/* Reset datalen to avoid display below */

drivers/staging/brcm80211/brcmfmac/dhd_dbg.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef _dhd_dbg_

#define _dhd_dbg_

#ifndef _BRCMF_DBG_H_

#define _BRCMF_DBG_H_



#if defined(BCMDBG)
@@ -73,4 +73,4 @@ 


extern int brcmf_msg_level;



#endif				/* _dhd_dbg_ */
 
#endif				/* _BRCMF_DBG_H_ */