Merge branch 'develop' into rdkbaccl-1026

Author: kpandu987

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ext.sh

@@ -2,7 +2,7 @@
 sleep 5
 
 iw phy phy0 interface add wifi0 type __ap
-iw phy phy0 interface add wifi0.1 type __ap
+iw phy phy0 interface add wifi1.2 type __ap
 iw phy phy0 interface add wifi1 type __ap
 iw phy phy0 interface add wifi2 type __ap
 iw phy phy0 interface add wifi1.1 type __ap
@@ -11,29 +11,29 @@ iw phy phy0 interface add wifi1.1 type __ap
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
 wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
 wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
-wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2`
-wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
+wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2`
+wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
 
 #Update the mac address using ip link command
 ifconfig wifi0 down
-ifconfig wifi0.1 down
+ifconfig wifi1.2 down
 ifconfig wifi1 down
 ifconfig wifi1.1 down
 ifconfig wifi2 down
 ip link set dev wifi0 address $wifi0_mac
-ip link set dev wifi0.1 address $wifi0_1_mac
+ip link set dev wifi1.2 address $wifi1_1_mac
 ip link set dev wifi1 address $wifi1_mac
-ip link set dev wifi1.1 address $wifi1_1_mac
+ip link set dev wifi1.1 address $wifi1_2_mac
 ip link set dev wifi2 address $wifi2_mac
 ifconfig wifi0 up
-ifconfig wifi0.1 up
+ifconfig wifi1.2 up
 ifconfig wifi1 up
 ifconfig wifi1.1 up
 ifconfig wifi2 up
 
 #To update al_mac addr in EasymesgCfg.json
 al_mac_addr=`cat /nvram/EasymeshCfg.json | grep AL_MAC_ADDR  | cut -d '"' -f4`
-al_mac=`iw dev wifi1.1 info | grep addr | cut -d ' ' -f2`
+al_mac=`iw dev wifi1.2 info | grep addr | cut -d ' ' -f2`
 
 if [ "$al_mac_addr" = "00:00:00:00:00:00" ]; then
         sed -i "s/$al_mac_addr/$al_mac/g" /nvram/EasymeshCfg.json

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em_ext.json

@@ -21,17 +21,24 @@
                     "RadioName": "wifi1",
                     "InterfaceList": [
                         {
-                            "InterfaceName": "wifi1.1",
+                            "InterfaceName": "wifi1.2",
                             "Bridge": "brlan0",
                             "vlanId": 0,
                             "vapIndex": 3,
                             "vapName": "mesh_sta_5g"
                         },
                         {
-                            "InterfaceName": "wifi1",
+                            "InterfaceName": "wifi1.1",
                             "Bridge": "brlan0",
                             "vlanId": 0,
                             "vapIndex": 2,
+                            "vapName": "mesh_backhaul_5g"
+                        },
+                        {
+                            "InterfaceName": "wifi1",
+                            "Bridge": "brlan0",
+                            "vlanId": 0,
+                            "vapIndex": 1,
                             "vapName": "private_ssid_5g"
                         }
 
@@ -41,13 +48,6 @@
                     "Index": 0,
                     "RadioName": "wifi0",
                     "InterfaceList": [
-                        {
-                            "InterfaceName": "wifi0.1",
-                            "Bridge": "brlan0",
-                            "vlanId": 0,
-                            "vapIndex": 1,
-                            "vapName": "mesh_backhaul_2g"
-                        },
                         {
                             "InterfaceName": "wifi0",
                             "Bridge": "brlan0",