Merge tag 'LA.UM.6.4.r1-05900-8x98.0' of https://source.codeaurora.org/quic/la/platform/system/qcom into HEAD

"LA.UM.6.4.r1-05900-8x98.0"

softap/jni/Android.mk

@@ -15,6 +15,6 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
                     $(JNI_H_INCLUDE)
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto
+LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto liblog
 
 include $(BUILD_SHARED_LIBRARY)

softap/sdk/Android.mk

@@ -12,6 +12,8 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
+LOCAL_USE_VNDK := true
+
 LOCAL_COPY_HEADERS_TO := sdk/softap/include
 LOCAL_COPY_HEADERS := qsap_api.h
 LOCAL_COPY_HEADERS += qsap.h
@@ -61,7 +63,7 @@ LOCAL_SRC_FILES := qsap_api.c \
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl
+LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl liblog
 
 include $(BUILD_SHARED_LIBRARY)
 

softap/sdk/qsap.c

@@ -54,7 +54,6 @@
 
 #include "qsap_api.h"
 #include "qsap.h"
-#include "wifi_fst.h"
 
 #include <sys/system_properties.h>
 
@@ -696,20 +695,3 @@ s32 wifi_qsap_stop_wigig_softap(void)
     usleep(AP_BSS_STOP_DELAY);
     return eSUCCESS;
 }
-
-int qsap_prepare_softap()
-{
-    ALOGD("Starting fstman\n");
-    return wifi_start_fstman(TRUE);
-}
-
-int qsap_unprepare_softap()
-{
-    ALOGD("Stopping fstman\n");
-    return wifi_stop_fstman(TRUE);
-}
-
-int qsap_is_fst_enabled()
-{
-    return is_fst_enabled();
-}

softap/sdk/qsap_api.c

@@ -45,6 +45,7 @@
 #include <unistd.h>
 #include <private/android_filesystem_config.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -64,7 +65,7 @@
 #define QCSAP_PARAM_GET_AUTO_CHANNEL 9
 #define WE_SET_SAP_CHANNELS  3
 
-//#define LOG_TAG "QCSDK-"
+#define LOG_TAG "QCSDK"
 
 #include "cutils/properties.h"
 #include "cutils/log.h"
@@ -84,6 +85,15 @@ s8 *Cmd_req[eCMD_REQ_LAST] = {
     "set"
 };
 
+/** Supported config file requests.
+  * WANRING: The enum eConf_req in the file qsap_api.h should be
+  * updated if Conf_req[], us updated
+  */
+s8 *Conf_req[CONF_REQ_LAST] = {
+    "dual2g",
+    "dual5g"
+};
+
 /*
  * WARNING: On updating the cmd_list, the enum esap_cmd in file
  * qsap_api.h must be updates to reflect the changes
@@ -167,6 +177,9 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "ieee80211h",            NULL             },
     { "enable_wigig_softap",   NULL             },
     { "interface",             NULL             },
+    { "ssid2",                 NULL             },
+    { "bridge",                NULL             },
+    { "ctrl_interface",        NULL             },
 };
 
 struct Command qsap_str[eSTR_LAST] = {
@@ -247,6 +260,9 @@ static s32 qsap_read_cfg(s8 *pfile, struct Command * pcmd, s8 *presp, u32 *plen,
     while(NULL != fgets(buf, MAX_CONF_LINE_LEN, fcfg)) {
         s8 *pline = buf;
 
+        if (strlen(buf) == 0)
+           continue;
+
         /** Skip the commented lines */
         if(buf[0] == '#') {
             if (ignore_comment) {
@@ -399,14 +415,6 @@ static s32 qsap_write_cfg(s8 *pfile, struct Command * pcmd, s8 *pVal, s8 *presp,
         unlink(pfile);
         return -1;
     }
-
-    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
-        ALOGE("Error changing group ownership of %s to %d: %s",
-                pfile, AID_WIFI, strerror(errno));
-        unlink(pfile);
-        return -1;
-    }
-
     if(result == eERR_UNKNOWN)
         return eERR_FEATURE_NOT_ENABLED;
 
@@ -552,14 +560,6 @@ static s32 qsap_change_cfg(s8 *pfile, struct Command * pcmd, u32 status)
         unlink(pfile);
         return -1;
     }
-
-    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
-        ALOGE("Error changing group ownership of %s to %d: %s",
-                pfile, AID_WIFI, strerror(errno));
-        unlink(pfile);
-        return -1;
-    }
-
     return 0;
 }
 
@@ -2439,6 +2439,7 @@ static int qsap_set_operating_mode(s32 mode, s8 *pmode, int pmode_len, s8 *tbuf,
             qsap_change_cfg(pcfg, &cmd_list[eCMD_REQUIRE_HT],ENABLE);
             /* fall through */
         case HW_MODE_N:
+        case HW_MODE_G:
         case HW_MODE_A:
             ulen = *tlen;
             qsap_write_cfg(pcfg, &cmd_list[eCMD_IEEE80211N],ieee11n_enable, tbuf, &ulen, HOSTAPD_CONF_QCOM_FILE);
@@ -2528,6 +2529,15 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
 
     SKIP_BLANK_SPACE(pcmd);
 
+    if(!(strncmp(pcmd, Conf_req[CONF_2g], strlen(Conf_req[CONF_2g])))) {
+           pcmd += strlen(Conf_req[CONF_2g]);
+           SKIP_BLANK_SPACE(pcmd);
+    } else if (!(strncmp(pcmd, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
+           pcmd += strlen(Conf_req[CONF_5g]);
+           SKIP_BLANK_SPACE(pcmd);
+    } else {
+	    // DO NOTHING
+    }
     cNum = qsap_get_cmd_num(pcmd);
     if(cNum == eCMD_INVALID) {
         *plen = qsap_scnprintf(presp, *plen, "%s", ERR_INVALID_ARG);
@@ -2537,7 +2547,7 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
     pVal = pcmd + strlen(cmd_list[cNum].name);
     if( (cNum != eCMD_COMMIT) &&
         (cNum != eCMD_RESET_TO_DEFAULT) &&
-        ((*pVal != '=') || (strlen(pVal) < 2)) ) {
+        ((*pVal != '=') || (((eCMD_PASSPHRASE != cNum)) && (strlen(pVal) < 2)))) {
         *plen = qsap_scnprintf(presp, *plen, "%s", ERR_INVALID_ARG);
         return;
     }
@@ -2660,6 +2670,8 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
             value = strlen(pVal);
             if(SSD_MAX_LEN < value)
                 goto error;
+            /* Disable ssid2 while setting ssid */
+            qsap_change_cfg(pcfg, &cmd_list[eCMD_SSID2], DISABLE);
             break;
 
         case eCMD_SET_MAX_CLIENTS:
@@ -3049,6 +3061,10 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
            *plen = qsap_scnprintf(presp, *plen, "%s", (value == eSUCCESS) ? SUCCESS :
                              ERR_UNKNOWN);
             return;
+        case eCMD_SSID2:
+            /* Disable ssid while setting ssid2 */
+            qsap_change_cfg(pcfg, &cmd_list[eCMD_SSID], DISABLE);
+            break;
 
         default: ;
             /** Do not goto error, in default case */
@@ -3088,6 +3104,16 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
     /* Skip any blank spaces */
     SKIP_BLANK_SPACE(pcmd);
 
+    if(!(strncmp(pcmd, Cmd_req[eCMD_SET], strlen(Cmd_req[eCMD_SET])))) {
+       if(!(strncmp(pcmd+4, Conf_req[CONF_2g], strlen(Conf_req[CONF_2g])))) {
+           pconffile = CONFIG_FILE_2G;
+       } else if (!(strncmp(pcmd+4, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
+           pconffile = CONFIG_FILE_5G;
+       } else {
+           pconffile = CONFIG_FILE;
+       }
+    }
+
     check_for_configuration_files();
     if(fIni == NULL)
         qsap_set_ini_filename();
@@ -3117,6 +3143,7 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
 #define DEFAULT_AUTH_ALG     1
 #define RECV_BUF_LEN         255
 #define CMD_BUF_LEN          255
+#define SET_BUF_LEN          15
 
 /** Command input
     argv[3] = SSID,
@@ -3133,6 +3160,8 @@ int qsapsetSoftap(int argc, char *argv[])
     int i;
     int hidden = 0;
     int sec = SEC_MODE_NONE;
+    char setCmd[SET_BUF_LEN] = "set";
+    int offset = 0;
 
     ALOGD("%s, %s, %s, %d\n", __FUNCTION__, argv[0], argv[1], argc);
 
@@ -3140,22 +3169,33 @@ int qsapsetSoftap(int argc, char *argv[])
         ALOGD("ARG: %d - %s\n", i+1, argv[i]);
     }
 
+    // check if 2nd arg is dual2g/dual5g
+    if (argc > 2 && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0)) {
+            snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
+            offset = 1;
+            argc--;
+    }
+
     /* set interface */
     if (argc > 2) {
-        snprintf(cmdbuf, CMD_BUF_LEN, "set interface=%s",argv[2]);
+        snprintf(cmdbuf, CMD_BUF_LEN, "%s interface=%s", setCmd, argv[2 + offset]);
     }
     else {
-        snprintf(cmdbuf, CMD_BUF_LEN, "set interface=%s", DEFAULT_INTFERACE);
+        snprintf(cmdbuf, CMD_BUF_LEN, "%s interface=%s", setCmd, DEFAULT_INTFERACE);
     }
     (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
 
 
     /** set SSID */
     if(argc > 3) {
-        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set ssid=%s",argv[3]);
+        // In case of dual2g/5g, Set ssid2 with hex values to accomodate sapce and special characters.
+        if (offset)
+            qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s ssid2=%s", setCmd, argv[3 + offset]);
+        else
+            qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s ssid=%s",setCmd, argv[3]);
     }
     else {
-        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set ssid=%s_%d", DEFAULT_SSID, rand());
+        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s ssid=%s_%d", setCmd, DEFAULT_SSID, rand());
     }
     (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
 
@@ -3166,10 +3206,10 @@ int qsapsetSoftap(int argc, char *argv[])
 
     rlen = RECV_BUF_LEN;
     if (argc > 4) {
-        if (strcmp(argv[4], "hidden") == 0) {
+        if (strcmp(argv[4 + offset], "hidden") == 0) {
              hidden = 1;
         }
-        snprintf(cmdbuf, CMD_BUF_LEN, "set ignore_broadcast_ssid=%d", hidden);
+        snprintf(cmdbuf, CMD_BUF_LEN, "%s ignore_broadcast_ssid=%d", setCmd, hidden);
         (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
         if(strncmp("success", respbuf, rlen) != 0) {
             ALOGE("Failed to set ignore_broadcast_ssid \n");
@@ -3179,7 +3219,7 @@ int qsapsetSoftap(int argc, char *argv[])
     /** channel */
     rlen = RECV_BUF_LEN;
     if(argc > 5) {
-        snprintf(cmdbuf, CMD_BUF_LEN, "set channel=%d", atoi(argv[5]));
+        snprintf(cmdbuf, CMD_BUF_LEN, "%s channel=%d", setCmd, atoi(argv[5 + offset]));
         (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
 
         if(strncmp("success", respbuf, rlen) != 0) {
@@ -3193,22 +3233,22 @@ int qsapsetSoftap(int argc, char *argv[])
     if(argc > 6) {
 
         /**TODO : need to identify the SEC strings for "wep", "wpa", "wpa2" */
-        if(!strcmp(argv[6], "open"))
+        if(!strcmp(argv[6 + offset], "open"))
             sec = SEC_MODE_NONE;
 
-        else if(!strcmp(argv[6], "wep"))
+        else if(!strcmp(argv[6 + offset], "wep"))
             sec = SEC_MODE_WEP;
 
-        else if(!strcmp(argv[6], "wpa-psk"))
+        else if(!strcmp(argv[6 + offset], "wpa-psk"))
             sec = SEC_MODE_WPA_PSK;
 
-        else if(!strcmp(argv[6], "wpa2-psk"))
+        else if(!strcmp(argv[6 + offset], "wpa2-psk"))
             sec = SEC_MODE_WPA2_PSK;
 
-        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set security_mode=%d",sec);
+        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s security_mode=%d",setCmd, sec);
     }
     else {
-        qsap_scnprintf(cmdbuf, sizeof(cmdbuf) , "set security_mode=%d", DEFAULT_AUTH_ALG);
+        qsap_scnprintf(cmdbuf, sizeof(cmdbuf) , "%s security_mode=%d", setCmd, DEFAULT_AUTH_ALG);
     }
 
     (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
@@ -3223,11 +3263,11 @@ int qsapsetSoftap(int argc, char *argv[])
     if ( (sec == SEC_MODE_WPA_PSK) || (sec == SEC_MODE_WPA2_PSK) ) {
         if(argc > 7) {
             /* If the input passphrase is more than 63 characters, consider first 63 characters only*/
-            if ( strlen(argv[7]) > 63 ) argv[7][63] = '\0';
-            qsap_scnprintf(cmdbuf, CMD_BUF_LEN, "set wpa_passphrase=%s",argv[7]);
+            if ( strlen(argv[7 + offset]) > 63 ) argv[7 + offset][63] = '\0';
+            qsap_scnprintf(cmdbuf, CMD_BUF_LEN, "%s wpa_passphrase=%s",setCmd, argv[7 + offset]);
         }
         else {
-            qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set wpa_passphrase=%s", DEFAULT_PASSPHRASE);
+            qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s wpa_passphrase=%s", setCmd, DEFAULT_PASSPHRASE);
         }
     }
 
@@ -3239,7 +3279,7 @@ int qsapsetSoftap(int argc, char *argv[])
 
     rlen = RECV_BUF_LEN;
     if(argc > 8) {
-        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set max_num_sta=%d",atoi(argv[8]));
+        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s max_num_sta=%d",setCmd, atoi(argv[8 + offset]));
     }
     (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
 
@@ -3249,7 +3289,7 @@ int qsapsetSoftap(int argc, char *argv[])
     }
     rlen = RECV_BUF_LEN;
 
-    qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set commit");
+    qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "%s commit", setCmd);
 
     (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
 
@@ -3283,14 +3323,14 @@ void check_for_configuration_files(void)
     /* Check if configuration files are present, if not create the default files */
 
     /* If configuration file does not exist copy the default file */
-    if ( NULL == (fp = fopen(CONFIG_FILE, "r")) ) {
-        wifi_qsap_reset_to_default(CONFIG_FILE, DEFAULT_CONFIG_FILE_PATH);
+    if ( NULL == (fp = fopen(pconffile, "r")) ) {
+        wifi_qsap_reset_to_default(pconffile, DEFAULT_CONFIG_FILE_PATH);
     }
     else {
 
         /* The configuration file could be of 0 byte size, replace with default */
         if (check_for_config_file_size(fp) <= 0)
-            wifi_qsap_reset_to_default(CONFIG_FILE, DEFAULT_CONFIG_FILE_PATH);
+            wifi_qsap_reset_to_default(pconffile, DEFAULT_CONFIG_FILE_PATH);
 
         fclose(fp);
     }
@@ -3314,12 +3354,6 @@ void check_for_configuration_files(void)
         ALOGE("Error changing permissions of %s to 0660: %s",
                 pfile, strerror(errno));
     }
-
-    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
-        ALOGE("Error changing group ownership of %s to %d: %s",
-                pfile, AID_WIFI, strerror(errno));
-    }
-
     /* If deny MAC list file does not exist, copy the default file */
     if ( NULL == (fp = fopen(DENY_LIST_FILE, "r")) ) {
         wifi_qsap_reset_to_default(DENY_LIST_FILE, DEFAULT_DENY_LIST_FILE_PATH);
@@ -3339,12 +3373,6 @@ void check_for_configuration_files(void)
         ALOGE("Error changing permissions of %s to 0660: %s",
                 pfile, strerror(errno));
     }
-
-    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
-        ALOGE("Error changing group ownership of %s to %d: %s",
-                pfile, AID_WIFI, strerror(errno));
-    }
-
     return;
 }
 
@@ -3358,6 +3386,115 @@ void qsap_set_ini_filename(void)
     return;
 }
 
+// IOCTL command to create and delete bridge interface //
+#ifndef SIOCBRADDBR
+#define SIOCBRADDBR 0x89a0
+#endif
+#ifndef SIOCBRDELBR
+#define SIOCBRDELBR 0x89a1
+#endif
+
+static int linux_set_iface_flags(int sock, const char *ifname, int dev_up)
+{
+    struct ifreq ifr;
+    int ret;
+
+    if (sock < 0)
+        return -1;
+
+    memset(&ifr, 0, sizeof(ifr));
+    strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
+
+    if (ioctl(sock, SIOCGIFFLAGS, &ifr) != 0) {
+        ret = errno ? -errno : -999;
+        ALOGE("Could not read interface %s flags: %s",
+               ifname, strerror(errno));
+        return ret;
+    }
+
+    if (dev_up) {
+        if (ifr.ifr_flags & IFF_UP)
+            return 0;
+        ifr.ifr_flags |= IFF_UP;
+    } else {
+        if (!(ifr.ifr_flags & IFF_UP))
+            return 0;
+        ifr.ifr_flags &= ~IFF_UP;
+    }
+
+    if (ioctl(sock, SIOCSIFFLAGS, &ifr) != 0) {
+        ret = errno ? -errno : -999;
+        ALOGE("Could not set interface %s flags (%s): %s",
+               ifname, dev_up ? "UP" : "DOWN", strerror(errno));
+        return ret;
+    }
+    return 0;
+}
+
+int qsap_control_bridge(int argc, char ** argv)
+{
+    int br_socket;
+
+    if (argc < 4) {
+        ALOGE("Command not supported");
+        return -1;
+    }
+
+    br_socket = socket(PF_INET, SOCK_DGRAM, 0);
+    if (br_socket < 0) {
+        ALOGE("socket(PF_INET,SOCK_DGRAM): %s",strerror(errno));
+        return -1;
+    }
+    if (!strncmp(argv[2],"create", 6)) {
+        if (ioctl(br_socket, SIOCBRADDBR, argv[3]) < 0) {
+            ALOGE("Could not add bridge %s: %s", argv[3], strerror(errno));
+            return -1;
+        }
+    } else if (!strncmp(argv[2],"remove", 6)) {
+        if (ioctl(br_socket, SIOCBRDELBR, argv[3]) < 0) {
+            ALOGE("Could not add remove %s: %s", argv[3], strerror(errno));
+            return -1;
+        }
+    } else if (!strncmp(argv[2],"up", 2)) {
+        return linux_set_iface_flags(br_socket, argv[3], 1);
+    } else if (!strncmp(argv[2],"down", 4)) {
+        return linux_set_iface_flags(br_socket, argv[3], 0);
+    } else {
+        ALOGE("Command %s not handled.", argv[2]);
+        return -1;
+    }
+
+    return 0;
+}
+
+
+int linux_get_ifhwaddr(const char *ifname, char *addr)
+{
+    struct ifreq ifr;
+    int sock = socket(AF_INET, SOCK_DGRAM, 0);
+
+#ifndef MAC2STR
+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
+#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+#endif
+    memset(&ifr, 0, sizeof(ifr));
+    strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
+    if (ioctl(sock, SIOCGIFHWADDR, &ifr)) {
+        ALOGE("Could not get interface %s hwaddr: %s", ifname, strerror(errno));
+        return -1;
+    }
+
+    if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
+        ALOGE("%s: Invalid HW-addr family 0x%04x", ifname, ifr.ifr_hwaddr.sa_family);
+        return -1;
+    }
+    memcpy(addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+    ALOGE("%s: " MACSTR, ifname, MAC2STR(addr));
+
+    return 0;
+}
+
+
 int qsap_add_or_remove_interface(const char *newIface , int createIface)
 {
     const char *wlanIface = "wlan0";

softap/sdk/qsap_api.h

@@ -34,7 +34,7 @@
 #if __cplusplus
 extern "C" {
 #endif
-
+#include <android/log.h>
 typedef unsigned char      u8;
 typedef char               s8;
 typedef unsigned short int u16;
@@ -88,6 +88,10 @@ enum error_val {
 #define WIFI_DRIVER_DEF_CONF_FILE        NULL
 #endif
 
+/** Configuration file name for SAP+SAP*/
+#define CONFIG_FILE_2G "/data/vendor/wifi/hostapd_dual2g.conf"
+#define CONFIG_FILE_5G "/data/vendor/wifi/hostapd_dual5g.conf"
+
 /** Configuration file name */
 #define CONFIG_FILE "/data/misc/wifi/hostapd.conf"
 
@@ -244,6 +248,14 @@ enum eCmd_req {
     eCMD_REQ_LAST
 };
 
+/** config request index - in the array Conf_req[] */
+enum eConf_req {
+    CONF_2g = 0,
+    CONF_5g = 1,
+
+    CONF_REQ_LAST
+};
+
 /**
   * Command numbers, these numbers form the index into the array of
   * command names stored in the 'cmd_list'.
@@ -333,6 +345,9 @@ typedef enum esap_cmd {
 
     eCMD_ENABLE_WIGIG_SOFTAP = 72,
     eCMD_INTERFACE           = 73,
+    eCMD_SSID2               = 74,
+    eCMD_BRIDGE              = 75,
+    eCMD_CTRL_INTERFACE      = 76,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;
@@ -494,7 +509,7 @@ typedef struct sap_auto_channel_info {
 #define IS_VALID_BSSID(x) (((value == ENABLE) || (value == DISABLE)) ? TRUE: FALSE)
 
 /** Validate the length of the passphrase */
-#define IS_VALID_PASSPHRASE_LEN(x) (((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) ? TRUE: FALSE)
+#define IS_VALID_PASSPHRASE_LEN(x) ((((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) || (x == 0)) ? TRUE: FALSE)
 
 /** Validate the beacon interval */
 #define IS_VALID_BEACON(x) (((x >= BCN_INTERVAL_MIN) && (x <= BCN_INTERVAL_MAX)) ? TRUE: FALSE)
@@ -603,6 +618,8 @@ int qsap_get_mode(s32 *pmode);
 int qsap_prepare_softap(void);
 int qsap_unprepare_softap(void);
 int qsap_is_fst_enabled(void);
+int qsap_control_bridge(int argc, char ** argv);
+int linux_get_ifhwaddr(const char *ifname, char *addr);
 
 #if __cplusplus
 };  // extern "C"