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

Commit f931868d authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: removed dhd_proto.h. 



dhd_proto.h was cleaned up and prototypes were moved to dhd.h.
dhd_proto.h was removed. This is a step in cleaning and
restucturing protocol layer.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d406f8e

drivers/net/wireless/brcm80211/brcmfmac/bcdc.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <brcmu_wifi.h>



#include "dhd.h"

#include "dhd_proto.h"

#include "dhd_bus.h"

#include "fwsignal.h"

#include "dhd_dbg.h"

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+15 −0
Original line number Diff line number Diff line
@@ -635,6 +635,18 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev); 
/* Return pointer to interface name */

char *brcmf_ifname(struct brcmf_pub *drvr, int idx);



/* Linkage, sets prot link and updates hdrlen in pub */

int brcmf_proto_attach(struct brcmf_pub *drvr);



/* Unlink, frees allocated protocol memory (including brcmf_proto) */

void brcmf_proto_detach(struct brcmf_pub *drvr);



/* Add any protocol-specific data header.

 * Caller must reserve prot_hdrlen prepend space.

 */

void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, u8 offset,

			 struct sk_buff *txp);



/* Query dongle */

int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,

			       void *buf, uint len);
@@ -655,4 +667,7 @@ u32 brcmf_get_chip_info(struct brcmf_if *ifp); 
void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,

		      bool success);



/* Sets dongle media info (drv_version, mac address). */

int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);



#endif				/* _BRCMF_H_ */

drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <brcmu_utils.h>

#include "dhd.h"

#include "dhd_bus.h"

#include "dhd_proto.h"

#include "dhd_dbg.h"

#include "fwil.h"

#include "tracepoint.h"

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include "dhd.h"

#include "dhd_bus.h"

#include "dhd_proto.h"

#include "dhd_dbg.h"

#include "fwil_types.h"

#include "p2p.h"

drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef _BRCMF_PROTO_H_

#define _BRCMF_PROTO_H_



/*

 * Exported from the brcmf protocol module (brcmf_cdc)

 */



/* Linkage, sets prot link and updates hdrlen in pub */

int brcmf_proto_attach(struct brcmf_pub *drvr);



/* Unlink, frees allocated protocol memory (including brcmf_proto) */

void brcmf_proto_detach(struct brcmf_pub *drvr);



/* Add any protocol-specific data header.

 * Caller must reserve prot_hdrlen prepend space.

 */

void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, u8 offset,

			 struct sk_buff *txp);



/* Sets dongle media info (drv_version, mac address). */

int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);



#endif				/* _BRCMF_PROTO_H_ */