Skip to content

Commit 8c46d32

Browse files
kpandu987kpandu987
committed
RDKBACCL-771 : Wifi interfaces should have constant unique MAC for 6G
Reason for change: updated bpi-macaddress srcrev and added needed changes to get the BH,iot wifi interfaces for 6G band Test Procedure: Basic EM test cases are passed Risks: Low Signed-off-by: keerthana.p <[email protected]>
1 parent f38686d commit 8c46d32

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ctrl.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ iw phy phy0 interface add wifi1.1 type __ap
99
iw phy phy0 interface add wifi1.2 type __ap
1010
iw phy phy0 interface add wifi1.3 type __ap
1111
iw phy phy0 interface add wifi2 type __ap
12+
iw phy phy0 interface add wifi2.1 type __ap
13+
iw phy phy0 interface add wifi2.2 type __ap
1214
iw phy phy0 interface add mld0 type __ap radios all
1315

1416
#Obtain the wifi mac address
1517
wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
1618
wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
1719
wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
1820
wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
19-
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
21+
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2 | head -n1`
2022
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
2123
wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
2224
wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
25+
wifi2_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.1 | cut -d " " -f 2 | head -n1`
26+
wifi2_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.2 | cut -d " " -f 2 | head -n1`
2327

2428
#Update the mac address using ip link command
2529
ifconfig wifi0 down
@@ -30,6 +34,8 @@ ifconfig wifi1.1 down
3034
ifconfig wifi1.2 down
3135
ifconfig wifi1.3 down
3236
ifconfig wifi2 down
37+
ifconfig wifi2.1 down
38+
ifconfig wifi2.2 down
3339

3440
ip link set dev wifi0 address $wifi0_mac
3541
ip link set dev wifi0.1 address $wifi0_1_mac
@@ -39,6 +45,8 @@ ip link set dev wifi1.1 address $wifi1_1_mac
3945
ip link set dev wifi1.2 address $wifi1_2_mac
4046
ip link set dev wifi1.3 address $wifi1_3_mac
4147
ip link set dev wifi2 address $wifi2_mac
48+
ip link set dev wifi2.1 address $wifi2_1_mac
49+
ip link set dev wifi2.2 address $wifi2_2_mac
4250

4351
ifconfig wifi0 up
4452
ifconfig wifi0.1 up
@@ -48,6 +56,8 @@ ifconfig wifi1.1 up
4856
ifconfig wifi1.2 up
4957
ifconfig wifi1.3 up
5058
ifconfig wifi2 up
59+
ifconfig wifi2.1 up
60+
ifconfig wifi2.2 up
5161

5262
# Set MLD interface address as wifi2 MAC address + 1
5363
prefix="${wifi2_mac%:*}"

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ iw phy phy0 interface add wifi1.1 type __ap
99
iw phy phy0 interface add wifi1.2 type __ap
1010
iw phy phy0 interface add wifi1.3 type __ap
1111
iw phy phy0 interface add wifi2 type __ap
12+
iw phy phy0 interface add wifi2.1 type __ap
13+
iw phy phy0 interface add wifi2.2 type __ap
1214
iw phy phy0 interface add mld0 type __ap radios all
1315

1416
#Obtain the wifi mac address
1517
wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
1618
wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
1719
wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
1820
wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
19-
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
21+
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2 | head -n1`
2022
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
2123
wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
2224
wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
25+
wifi2_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.1 | cut -d " " -f 2 | head -n1`
26+
wifi2_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.2 | cut -d " " -f 2 | head -n1`
2327

2428
#Update the mac address using ip link command
2529
ifconfig wifi0 down
@@ -30,6 +34,8 @@ ifconfig wifi1.1 down
3034
ifconfig wifi1.2 down
3135
ifconfig wifi1.3 down
3236
ifconfig wifi2 down
37+
ifconfig wifi2.1 down
38+
ifconfig wifi2.2 down
3339

3440
ip link set dev wifi0 address $wifi0_mac
3541
ip link set dev wifi0.1 address $wifi0_1_mac
@@ -39,6 +45,8 @@ ip link set dev wifi1.1 address $wifi1_1_mac
3945
ip link set dev wifi1.2 address $wifi1_2_mac
4046
ip link set dev wifi1.3 address $wifi1_3_mac
4147
ip link set dev wifi2 address $wifi2_mac
48+
ip link set dev wifi2.1 address $wifi2_1_mac
49+
ip link set dev wifi2.2 address $wifi2_2_mac
4250

4351
ifconfig wifi0 up
4452
ifconfig wifi0.1 up
@@ -48,6 +56,8 @@ ifconfig wifi1.1 up
4856
ifconfig wifi1.2 up
4957
ifconfig wifi1.3 up
5058
ifconfig wifi2 up
59+
ifconfig wifi2.1 up
60+
ifconfig wifi2.2 up
5161

5262
# Set MLD interface address as wifi2 MAC address + 1
5363
prefix="${wifi2_mac%:*}"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@
77
"Index": 2,
88
"RadioName": "wifi2",
99
"InterfaceList": [
10+
{
11+
"InterfaceName": "wifi2.2",
12+
"Bridge": "brlan0",
13+
"vlanId": 0,
14+
"vapIndex": 17,
15+
"vapName": "iot_ssid_6g"
16+
},
17+
{
18+
"InterfaceName": "wifi2.1",
19+
"Bridge": "brlan0",
20+
"vlanId": 0,
21+
"vapIndex": 22,
22+
"vapName": "mesh_backhaul_6g"
23+
},
1024
{
1125
"InterfaceName": "wifi2",
1226
"Bridge": "brlan0",

‎meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;branch=develop"
99

1010
S = "${WORKDIR}/git"
1111
PV = "1.0.0"
12-
SRCREV = "e2060a77127aff5c2a49cb4b5957597acb642db2"
12+
SRCREV = "55d70f1560fc9092c037d869aae450524b5c6ae8"
1313

1414
CXXFLAGS_append = " -DAARCH64_BUILD"
1515
CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', bb.utils.contains('DISTRO_FEATURES', 'em_extender', ' -D_EM_EXT_BUILD_ -D_EM_BUILD_ ',' -D_EM_BUILD_ ', d), ' ', d)}"

0 commit comments

Comments
 (0)