Snap for 6758226 from 8996467be9cb5d5ce95dffb156b07fa62fe496cb to rvc-qpr1-release
Change-Id: Ieb1c9010e12033880becdb38de7be8148c3a2b3e
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk
index 3d872bb..5c77639 100644
--- a/qcwcn/wifi_hal/Android.mk
+++ b/qcwcn/wifi_hal/Android.mk
@@ -50,6 +50,13 @@
# Allow implicit fallthrough in nan_ind.cpp:834 until it is fixed.
LOCAL_CFLAGS += -Wno-implicit-fallthrough
+ifdef WIFI_DRIVER_STATE_CTRL_PARAM
+LOCAL_CFLAGS += -DWIFI_DRIVER_STATE_CTRL_PARAM=\"$(WIFI_DRIVER_STATE_CTRL_PARAM)\"
+ifdef WIFI_DRIVER_STATE_ON
+LOCAL_CFLAGS += -DWIFI_DRIVER_STATE_ON=\"$(WIFI_DRIVER_STATE_ON)\"
+endif
+endif
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
external/libnl/include \
@@ -114,6 +121,13 @@
# Allow implicit fallthrough in nan_ind.cpp:834 until it is fixed.
LOCAL_CFLAGS += -Wno-implicit-fallthrough
+ifdef WIFI_DRIVER_STATE_CTRL_PARAM
+LOCAL_CFLAGS += -DWIFI_DRIVER_STATE_CTRL_PARAM=\"$(WIFI_DRIVER_STATE_CTRL_PARAM)\"
+ifdef WIFI_DRIVER_STATE_ON
+LOCAL_CFLAGS += -DWIFI_DRIVER_STATE_ON=\"$(WIFI_DRIVER_STATE_ON)\"
+endif
+endif
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
external/libnl/include \
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index 7b85099..6ab0e64 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -919,6 +919,43 @@
return ret;
}
+#ifdef WIFI_DRIVER_STATE_CTRL_PARAM
+static int wifi_update_driver_state(const char *state) {
+ struct timespec ts;
+ int len, fd, ret = 0, count = 5;
+ ts.tv_sec = 0;
+ ts.tv_nsec = 200 * 1000000L;
+
+ do {
+ if (access(WIFI_DRIVER_STATE_CTRL_PARAM, R_OK|W_OK) == 0)
+ break;
+ nanosleep(&ts, (struct timespec *)NULL);
+ } while (--count > 0); /* wait at most 1 second for completion. */
+ if (count == 0) {
+ ALOGE("Failed to access driver state control param %s, %d at %s",
+ strerror(errno), errno, WIFI_DRIVER_STATE_CTRL_PARAM);
+ return -1;
+ }
+
+ fd = TEMP_FAILURE_RETRY(open(WIFI_DRIVER_STATE_CTRL_PARAM, O_WRONLY));
+ if (fd < 0) {
+ ALOGE("Failed to open driver state control param at %s",
+ WIFI_DRIVER_STATE_CTRL_PARAM);
+ return -1;
+ }
+
+ len = strlen(state) + 1;
+ if (TEMP_FAILURE_RETRY(write(fd, state, len)) != len) {
+ ALOGE("Failed to write driver state control param at %s",
+ WIFI_DRIVER_STATE_CTRL_PARAM);
+ ret = -1;
+ }
+
+ close(fd);
+ return ret;
+}
+#endif
+
wifi_error wifi_wait_for_driver_ready(void)
{
// This function will wait to make sure basic client netdev is created
@@ -926,6 +963,12 @@
int count = (POLL_DRIVER_MAX_TIME_MS * 1000) / POLL_DRIVER_DURATION_US;
FILE *fd;
+#if defined(WIFI_DRIVER_STATE_CTRL_PARAM) && defined(WIFI_DRIVER_STATE_ON)
+ if (wifi_update_driver_state(WIFI_DRIVER_STATE_ON) < 0) {
+ return WIFI_ERROR_UNKNOWN;
+ }
+#endif
+
do {
if ((fd = fopen("/sys/class/net/wlan0", "r")) != NULL) {
fclose(fd);
