diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-29 13:17:25 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-29 13:17:25 +0200 |
| commit | 11fad658d36b91f17e5ec85060784a1f659707b9 (patch) | |
| tree | 7c1c4b33070871158f4df95ae3fbad6c8c85b448 | |
| parent | d9e4ebbe443a07567e87adce66ebaa0ff646520c (diff) | |
| download | kernel_samsung_espresso10-11fad658d36b91f17e5ec85060784a1f659707b9.tar.gz kernel_samsung_espresso10-11fad658d36b91f17e5ec85060784a1f659707b9.tar.bz2 kernel_samsung_espresso10-11fad658d36b91f17e5ec85060784a1f659707b9.zip | |
bcmdhd: fix some p2p errors
| -rw-r--r-- | drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c b/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c index ed840bc00fd..be72081623d 100644 --- a/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c @@ -3635,9 +3635,11 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) #if defined(SOFTAP) if (ap_fw_loaded == FALSE) #endif + if ((dhd->op_mode & HOSTAPD_MASK) != HOSTAPD_MASK) { if ((res = dhd_keep_alive_onoff(dhd)) < 0) DHD_ERROR(("%s set keeplive failed %d\n", __FUNCTION__, res)); + } } #endif /* defined(KEEP_ALIVE) */ diff --git a/drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c b/drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c index 0238a63b060..fed0645d461 100644 --- a/drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c +++ b/drivers/net/wireless/bcmdhd/src/wl/sys/wl_android.c @@ -73,6 +73,7 @@ #define CMD_GETBAND "GETBAND" #define CMD_COUNTRY "COUNTRY" #define CMD_P2P_SET_NOA "P2P_SET_NOA" +#define CMD_P2P_GET_NOA "P2P_GET_NOA" #define CMD_P2P_SET_PS "P2P_SET_PS" #define CMD_SET_AP_WPS_P2P_IE "SET_AP_WPS_P2P_IE" @@ -872,6 +873,9 @@ int wl_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) bytes_written = wl_cfg80211_set_p2p_noa(net, command + skip, priv_cmd.total_len - skip); } + else if (strnicmp(command, CMD_P2P_GET_NOA, strlen(CMD_P2P_GET_NOA)) == 0) { + bytes_written = wl_cfg80211_get_p2p_noa(net, command, priv_cmd.total_len); + } else if (strnicmp(command, CMD_P2P_SET_PS, strlen(CMD_P2P_SET_PS)) == 0) { int skip = strlen(CMD_P2P_SET_PS) + 1; bytes_written = wl_cfg80211_set_p2p_ps(net, command + skip, |