psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wlan: Don't overwrite the channel configured in hostapd.conf"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-12-05 09:42:26 -08:00
committed by Gerrit - the friendly Code Review server
parent fc7138812d 2addd175cc
commit 396a3fe49d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
softap/sdk/Android.mk
View File

@@ -12,6 +12,10 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\" LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
ifeq ($(PLATFORM_VERSION),4.4)
LOCAL_CFLAGS += -DANDROID_VERSION_KITKAT
endif
ifdef WIFI_DRIVER_MODULE_PATH ifdef WIFI_DRIVER_MODULE_PATH
LOCAL_CFLAGS += -DWIFI_DRIVER_MODULE_PATH=\"$(WIFI_DRIVER_MODULE_PATH)\" LOCAL_CFLAGS += -DWIFI_DRIVER_MODULE_PATH=\"$(WIFI_DRIVER_MODULE_PATH)\"
endif endif

3
softap/sdk/qsap_api.c
View File

@@ -3094,6 +3094,7 @@ int qsapsetSoftap(int argc, char *argv[])
return -1; return -1;
} }
} }
#ifndef ANDROID_VERSION_KITKAT
/** channel */ /** channel */
rlen = RECV_BUF_LEN; rlen = RECV_BUF_LEN;
if(argc > 5) { if(argc > 5) {
@@ -3105,7 +3106,7 @@ int qsapsetSoftap(int argc, char *argv[])
return -1; return -1;
} }
} }
#endif
/** Security */ /** Security */
rlen = RECV_BUF_LEN; rlen = RECV_BUF_LEN;
if(argc > 6) { if(argc > 6) {