diff options
Diffstat (limited to 'bcmdhd')
| -rw-r--r-- | bcmdhd/firmware/bcm4354/fw_bcm4354.bin | bin | 625635 -> 626573 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin | bin | 548322 -> 548604 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin | bin | 588340 -> 588621 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin | bin | 661509 -> 661983 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | bcmdhd/firmware/bcm4358/fw_bcm4358.bin | bin | 629040 -> 629248 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin | bin | 560830 -> 560830 bytes | |||
| -rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 10 | ||||
| -rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 45 |
8 files changed, 11 insertions, 44 deletions
diff --git a/bcmdhd/firmware/bcm4354/fw_bcm4354.bin b/bcmdhd/firmware/bcm4354/fw_bcm4354.bin Binary files differindex 8a766f7..724b1fa 100644 --- a/bcmdhd/firmware/bcm4354/fw_bcm4354.bin +++ b/bcmdhd/firmware/bcm4354/fw_bcm4354.bin diff --git a/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin b/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin Binary files differindex 43efaaa..9c95b5c 100644 --- a/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin +++ b/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin Binary files differindex 6404d65..f25ff54 100644..100755 --- a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin +++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin Binary files differindex 59d7663..2544f66 100644..100755 --- a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin +++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin diff --git a/bcmdhd/firmware/bcm4358/fw_bcm4358.bin b/bcmdhd/firmware/bcm4358/fw_bcm4358.bin Binary files differindex 04e6b82..2ae8dab 100644..100755 --- a/bcmdhd/firmware/bcm4358/fw_bcm4358.bin +++ b/bcmdhd/firmware/bcm4358/fw_bcm4358.bin diff --git a/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin b/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin Binary files differindex 37d48d1..19c26a8 100644..100755 --- a/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin +++ b/bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index a86a454..47eea15 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -74,6 +74,7 @@ typedef enum { GSCAN_ATTRIBUTE_RSSI_HIGH, GSCAN_ATTRIBUTE_HOTLIST_ELEM, GSCAN_ATTRIBUTE_HOTLIST_FLUSH, + GSCAN_ATTRIBUTE_HOTLIST_BSSID_COUNT, /* remaining reserved for additional attributes */ GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE = 60, @@ -1016,6 +1017,11 @@ public: return result; } + result = request.put_u32(GSCAN_ATTRIBUTE_HOTLIST_BSSID_COUNT, mParams.num_bssid); + if (result < 0) { + return result; + } + struct nlattr * attr = request.attr_start(GSCAN_ATTRIBUTE_HOTLIST_BSSIDS); for (int i = 0; i < mParams.num_bssid; i++) { nlattr *attr2 = request.attr_start(GSCAN_ATTRIBUTE_HOTLIST_ELEM); @@ -1174,6 +1180,10 @@ public: } } int createSetupRequest(WifiRequest& request) { + if (epno_params.num_networks > MAX_EPNO_NETWORKS) { + ALOGE("wrong epno num_networks:%d", epno_params.num_networks); + return WIFI_ERROR_INVALID_ARGS; + } int result = request.create(GOOGLE_OUI, GSCAN_SUBCMD_SET_EPNO_SSID); if (result < 0) { return result; diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c index f9dbb95..5d24799 100644 --- a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c +++ b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c @@ -168,48 +168,5 @@ int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon, const struct wpabuf *proberesp, const struct wpabuf *assocresp) { - char *buf; - const struct wpabuf *ap_wps_p2p_ie = NULL; - - char *_cmd = "SET_AP_WPS_P2P_IE"; - char *pbuf; - int ret = 0; - int i, buf_len; - struct cmd_desc { - int cmd; - const struct wpabuf *src; - } cmd_arr[] = { - {0x1, beacon}, - {0x2, proberesp}, - {0x4, assocresp}, - {-1, NULL} - }; - - wpa_printf(MSG_DEBUG, "%s: Entry", __func__); - for (i = 0; cmd_arr[i].cmd != -1; i++) { - ap_wps_p2p_ie = cmd_arr[i].src; - if (ap_wps_p2p_ie) { - buf_len = strlen(_cmd) + 3 + wpabuf_len(ap_wps_p2p_ie); - buf = os_zalloc(buf_len); - if (NULL == buf) { - wpa_printf(MSG_ERROR, "%s: Out of memory", - __func__); - ret = -1; - break; - } - } else { - continue; - } - pbuf = buf; - pbuf += snprintf(pbuf, buf_len - wpabuf_len(ap_wps_p2p_ie), - "%s %d",_cmd, cmd_arr[i].cmd); - *pbuf++ = '\0'; - os_memcpy(pbuf, wpabuf_head(ap_wps_p2p_ie), wpabuf_len(ap_wps_p2p_ie)); - ret = wpa_driver_nl80211_driver_cmd(priv, buf, buf, buf_len); - os_free(buf); - if (ret < 0) - break; - } - - return ret; + return 0; } |