diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-06-29 16:47:27 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 09:57:19 -0700 |
commit | 8af2d2a502167d901a34ecb658ea8c8a9d64734a (patch) | |
tree | 500ef78a332c08662dc0e2cc999a15fc9f87a6a1 /drivers/staging/brcm80211/brcmfmac/dhd_common.c | |
parent | 523a29ed1e50ac66a06456d78f82d4c6a12d2ab3 (diff) | |
download | op-kernel-dev-8af2d2a502167d901a34ecb658ea8c8a9d64734a.zip op-kernel-dev-8af2d2a502167d901a34ecb658ea8c8a9d64734a.tar.gz |
staging: brcm80211: remove PKT_FILTER_SUPPORT macro definition
Packet filtering support is now always compiled into the fullmac
driver.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/dhd_common.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 8f593cf..b481eb3 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -1190,6 +1190,7 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) uint bcn_timeout = 3; int scan_assoc_time = 40; int scan_unassoc_time = 40; + int i; #ifdef GET_CUSTOM_MAC_ENABLE int ret = 0; u8 ea_addr[ETH_ALEN]; @@ -1288,22 +1289,17 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) brcmf_c_arp_offload_set(dhd, brcmf_arp_mode); brcmf_c_arp_offload_enable(dhd, brcmf_arp_enable); -#ifdef PKT_FILTER_SUPPORT - { - int i; - /* Set up pkt filter */ - if (brcmf_pkt_filter_enable) { - for (i = 0; i < dhd->pktfilter_count; i++) { - brcmf_c_pktfilter_offload_set(dhd, - dhd->pktfilter[i]); - brcmf_c_pktfilter_offload_enable(dhd, - dhd->pktfilter[i], - brcmf_pkt_filter_init, - brcmf_master_mode); - } + /* Set up pkt filter */ + if (brcmf_pkt_filter_enable) { + for (i = 0; i < dhd->pktfilter_count; i++) { + brcmf_c_pktfilter_offload_set(dhd, + dhd->pktfilter[i]); + brcmf_c_pktfilter_offload_enable(dhd, + dhd->pktfilter[i], + brcmf_pkt_filter_init, + brcmf_master_mode); } } -#endif /* PKT_FILTER_SUPPORT */ brcmf_os_proto_unblock(dhd); |