diff options
| author | Greg Goldman <ggoldman@broadcom.com> | 2011-02-18 17:12:19 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-02-18 17:16:04 -0800 |
| commit | beb93055b74ce7608f2801b2efc025bb32313988 (patch) | |
| tree | 56b311659dc71806bb071c43c3300a1b5931f0ad | |
| parent | 696ecacfc59e5a8e822afb6a8f92b35cfdcabb63 (diff) | |
| download | qemu-beb93055b74ce7608f2801b2efc025bb32313988.tar.gz | |
net: wireless: bcm4329: Fix disable pno call
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcm4329/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/bcm4329/dhd_common.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcm4329/Makefile b/drivers/net/wireless/bcm4329/Makefile index dd0452d129e..5a662be7fc5 100644 --- a/drivers/net/wireless/bcm4329/Makefile +++ b/drivers/net/wireless/bcm4329/Makefile @@ -7,7 +7,7 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2 \ -DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DDHD_DEBUG_TRAP -DSOFTAP \ -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT \ -DGET_CUSTOM_MAC_ENABLE -DSET_RANDOM_MAC_SOFTAP -DCSCAN -DHW_OOB \ - -DKEEP_ALIVE -DPNO_SUPPORT \ + -DKEEP_ALIVE -DPNO_SUPPORT \ -Idrivers/net/wireless/bcm4329 -Idrivers/net/wireless/bcm4329/include DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \ diff --git a/drivers/net/wireless/bcm4329/dhd_common.c b/drivers/net/wireless/bcm4329/dhd_common.c index 9a345fb4307..8fcb95fde82 100644 --- a/drivers/net/wireless/bcm4329/dhd_common.c +++ b/drivers/net/wireless/bcm4329/dhd_common.c @@ -1911,12 +1911,12 @@ int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled) if ((pfn_enabled) && \ ((ret = dhdcdc_set_ioctl(dhd, 0, WLC_GET_BSSID, \ (char *)&bssid, ETHER_ADDR_LEN)) == BCME_NOTASSOCIATED)) { - DHD_TRACE(("%s pno enable called in disassoc mode\n", __FUNCTION__)); + DHD_TRACE(("%s pno enable called in disassoc mode\n", __FUNCTION__)); } - else { - DHD_ERROR(("%s pno enable called in assoc mode ret=%d\n", \ - __FUNCTION__, ret)); - return ret; + else if (pfn_enabled) { + DHD_ERROR(("%s pno enable called in assoc mode ret=%d\n", \ + __FUNCTION__, ret)); + return ret; } /* Enable/disable PNO */ |