summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-09-07 10:24:49 -0700
committerSimone Willett <swillett@nvidia.com>2012-09-14 12:00:50 -0700
commit0a01760181d389f5f1c39ab9fc84066c24e09d24 (patch)
treecec952421b2b36436422f9705011967bb6d5e74c /drivers/net
parente22e367fae07bb5b88a1d1eb78b5eac73e0e69a3 (diff)
net: wireless: bcmdhd: Fix filtering call during dhcp session
Change-Id: I38e426ef0e3a73481269b7d2c842201a24894901 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> (cherry picked from commit b8acb0350dff5f73943690a51251dab6a68bf2d7) Reviewed-on: http://git-master/r/131408 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Nitin Bindal <nbindal@nvidia.com> Tested-by: Nitin Bindal <nbindal@nvidia.com> Reviewed-by: Rakesh Kumar <krakesh@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcmdhd/dhd_linux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 5d504d795ccc..53515e86ed3f 100644
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -581,8 +581,9 @@ void dhd_enable_packet_filter(int value, dhd_pub_t *dhd)
DHD_TRACE(("%s: enter, value = %d\n", __FUNCTION__, value));
/* 1 - Enable packet filter, only allow unicast packet to send up */
/* 0 - Disable packet filter */
- if ((dhd_pkt_filter_enable && !dhd->dhcp_in_progress) &&
- (!value || (dhd_check_ap_wfd_mode_set(dhd) == FALSE))) {
+ if (dhd_pkt_filter_enable && (!value ||
+ ((dhd_check_ap_wfd_mode_set(dhd) == FALSE) &&
+ !dhd->dhcp_in_progress))) {
for (i = 0; i < dhd->pktfilter_count; i++) {
dhd_pktfilter_offload_enable(dhd, dhd->pktfilter[i],
value, dhd_master_mode);