diff options
| author | Greg Goldman <ggoldman@broadcom.com> | 2011-10-09 02:32:24 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-09 02:32:24 +0100 |
| commit | 487369c2e3359c2fef801e17c65af1f18abceac6 (patch) | |
| tree | 898fed5434008a39d8f303c5473d62106a45c29c | |
| parent | 58bceb36f5ce4f089a4be11825a3a3ed04c63016 (diff) | |
net: wireless: bcmdhd: Fixing missing WLP2P defintion for p2p
Change-Id: I9683fe499fd6cae89468dbb048c9fd8f1b13ecce
Signed-off-by: Howard M. Harte <hharte@broadcom.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 9 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index c50f05325f6..582ed8c9579 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -1553,8 +1553,10 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) #endif #ifdef AP uint32 mpc = 0; /* Turn MPC off for AP/APSTA mode */ +#endif /* AP */ +#if defined(AP) || defined(WLP2P) uint32 apsta = 1; /* Enable APSTA mode */ -#endif +#endif /* defined(AP) || defined(WLP2P) */ #ifdef GET_CUSTOM_MAC_ENABLE struct ether_addr ea_addr; #endif /* GET_CUSTOM_MAC_ENABLE */ @@ -1653,11 +1655,12 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) /* Turn off MPC in AP mode */ bcm_mkiovar("mpc", (char *)&mpc, 4, iovbuf, sizeof(iovbuf)); dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0); - +#endif /* AP */ +#if defined(AP) || defined(WLP2P) /* Enable APSTA mode */ bcm_mkiovar("apsta", (char *)&apsta, 4, iovbuf, sizeof(iovbuf)); dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0); -#endif +#endif /* defined(AP) || defined(WLP2P) */ #if defined(SOFTAP) if (ap_fw_loaded == TRUE) { dhd_wl_ioctl_cmd(dhd, WLC_SET_DTIMPRD, (char *)&dtim, sizeof(dtim), TRUE, 0); diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index c6e7095f6af..77decc571d9 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -2261,6 +2261,7 @@ dhd_open(struct net_device *net) if (ifidx == 0) { atomic_set(&dhd->pend_8021x_cnt, 0); #if defined(WL_CFG80211) + printf("\n cfg %s\n", dhd_version); wl_android_wifi_on(net); #endif |