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

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

brcmfmac: (clean) Rename files wl_cfg80211 to cfg80211 



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 76b5a96d

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ ccflags-y += -D__CHECK_ENDIAN__ 


obj-$(CONFIG_BRCMFMAC) += brcmfmac.o

brcmfmac-objs += \

		wl_cfg80211.o \

		cfg80211.o \

		chip.o \

		fwil.o \

		fweh.o \

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "fwil_types.h"

#include "btcoex.h"

#include "p2p.h"

#include "wl_cfg80211.h"

#include "cfg80211.h"



/* T1 start SCO/eSCO priority suppression */

#define BRCMF_BTCOEX_OPPR_WIN_TIME   2000

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c→drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "fwil_types.h"

#include "p2p.h"

#include "btcoex.h"

#include "wl_cfg80211.h"

#include "cfg80211.h"

#include "feature.h"

#include "fwil.h"

#include "proto.h"
@@ -5657,7 +5657,8 @@ enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp) 
	return wdev->iftype;

}



bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, unsigned long state)

bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg,

			     unsigned long state)

{

	struct brcmf_cfg80211_vif *vif;

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h→drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h

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

 */



#ifndef _wl_cfg80211_h_

#define _wl_cfg80211_h_

#ifndef BRCMFMAC_CFG80211_H

#define BRCMFMAC_CFG80211_H



/* for brcmu_d11inf */

#include <brcmu_d11.h>
@@ -480,7 +480,8 @@ const struct brcmf_tlv * 
brcmf_parse_tlvs(const void *buf, int buflen, uint key);

u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,

			struct ieee80211_channel *ch);

bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, unsigned long state);

bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg,

			     unsigned long state);

void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,

				  struct brcmf_cfg80211_vif *vif);

bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
@@ -493,4 +494,4 @@ void brcmf_set_mpc(struct brcmf_if *ndev, int mpc); 
void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);

void brcmf_cfg80211_free_netdev(struct net_device *ndev);



#endif				/* _wl_cfg80211_h_ */
 
#endif /* BRCMFMAC_CFG80211_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "debug.h"

#include "fwil_types.h"

#include "p2p.h"

#include "wl_cfg80211.h"

#include "cfg80211.h"

#include "fwil.h"

#include "fwsignal.h"

#include "feature.h"