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

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

staging: brcm80211: remove PKT_FILTER_SUPPORT macro definition 



Packet filtering support is now always compiled into the fullmac
driver.

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 523a29ed

drivers/staging/brcm80211/brcmfmac/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ ccflags-y := \ 
	-DEMBEDDED_PLATFORM	\

	-DEMBEDDED_PLATFORM	\

	-DMAX_HDR_READ=64	\

	-DMAX_HDR_READ=64	\

	-DMMC_SDIO_ABORT	\

	-DMMC_SDIO_ABORT	\

	-DPKT_FILTER_SUPPORT	\

	-DSHOW_EVENTS		\

	-DSHOW_EVENTS		\

	-DTOE

	-DTOE

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -970,11 +970,9 @@ extern int brcmf_bus_start(dhd_pub_t *dhdp); 
extern void brcmf_wait_for_event(dhd_pub_t *dhd, bool * lockvar);

extern void brcmf_wait_for_event(dhd_pub_t *dhd, bool * lockvar);

extern void brcmf_wait_event_wakeup(dhd_pub_t *dhd);

extern void brcmf_wait_event_wakeup(dhd_pub_t *dhd);





#ifdef PKT_FILTER_SUPPORT

extern void brcmf_c_pktfilter_offload_set(dhd_pub_t *dhd, char *arg);

extern void brcmf_c_pktfilter_offload_set(dhd_pub_t *dhd, char *arg);

extern void brcmf_c_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg,

extern void brcmf_c_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg,

					     int enable, int master_mode);

					     int enable, int master_mode);

#endif





#ifdef BCMDBG

#ifdef BCMDBG

#define ASSERT(exp) \

#define ASSERT(exp) \

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+10 −14
Original line number Original line Diff line number Diff line
@@ -1190,6 +1190,7 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) 
	uint bcn_timeout = 3;

	uint bcn_timeout = 3;

	int scan_assoc_time = 40;

	int scan_assoc_time = 40;

	int scan_unassoc_time = 40;

	int scan_unassoc_time = 40;

	int i;

#ifdef GET_CUSTOM_MAC_ENABLE

#ifdef GET_CUSTOM_MAC_ENABLE

	int ret = 0;

	int ret = 0;

	u8 ea_addr[ETH_ALEN];

	u8 ea_addr[ETH_ALEN];
@@ -1288,9 +1289,6 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) 
		brcmf_c_arp_offload_set(dhd, brcmf_arp_mode);

		brcmf_c_arp_offload_set(dhd, brcmf_arp_mode);

	brcmf_c_arp_offload_enable(dhd, brcmf_arp_enable);

	brcmf_c_arp_offload_enable(dhd, brcmf_arp_enable);





#ifdef PKT_FILTER_SUPPORT

	{

		int i;

	/* Set up pkt filter */

	/* Set up pkt filter */

	if (brcmf_pkt_filter_enable) {

	if (brcmf_pkt_filter_enable) {

		for (i = 0; i < dhd->pktfilter_count; i++) {

		for (i = 0; i < dhd->pktfilter_count; i++) {
@@ -1302,8 +1300,6 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) 
			     brcmf_master_mode);

			     brcmf_master_mode);

		}

		}

	}

	}

	}

#endif				/* PKT_FILTER_SUPPORT */





	brcmf_os_proto_unblock(dhd);

	brcmf_os_proto_unblock(dhd);

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -375,7 +375,6 @@ static int brcmf_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, 




static void brcmf_set_packet_filter(int value, dhd_pub_t *dhd)

static void brcmf_set_packet_filter(int value, dhd_pub_t *dhd)

{

{

#ifdef PKT_FILTER_SUPPORT

	DHD_TRACE(("%s: %d\n", __func__, value));

	DHD_TRACE(("%s: %d\n", __func__, value));

	/* 1 - Enable packet filter, only allow unicast packet to send up */

	/* 1 - Enable packet filter, only allow unicast packet to send up */

	/* 0 - Disable packet filter */

	/* 0 - Disable packet filter */
@@ -388,7 +387,6 @@ static void brcmf_set_packet_filter(int value, dhd_pub_t *dhd) 
						     value, brcmf_master_mode);

						     value, brcmf_master_mode);

		}

		}

	}

	}

#endif

}

}





#if defined(CONFIG_HAS_EARLYSUSPEND)

#if defined(CONFIG_HAS_EARLYSUSPEND)