Merge "[[rdkb][common] remove mtk_easymesh feature in ccn34 project]"
diff --git a/recipes-core/dropbear/dropbear_%.bbappend b/recipes-core/dropbear/dropbear_%.bbappend
index af08286..227e27e 100644
--- a/recipes-core/dropbear/dropbear_%.bbappend
+++ b/recipes-core/dropbear/dropbear_%.bbappend
@@ -4,7 +4,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = "file://rdkb-dropbear-extend-default-path.patch"
+SRC_URI_append = " file://rdkb-dropbear-extend-default-path.patch "
do_configure_prepend_hybrid () {
export LIBS="${LIBS} -ltelemetry_msgsender"
diff --git a/recipes-extended/tdkb/files/0002-Add-tdk-utility-functions.patch b/recipes-extended/tdkb/files/0002-Add-tdk-utility-functions.patch
index 75285ea..92c925a 100644
--- a/recipes-extended/tdkb/files/0002-Add-tdk-utility-functions.patch
+++ b/recipes-extended/tdkb/files/0002-Add-tdk-utility-functions.patch
@@ -11,7 +11,7 @@
index fefc1947..ef8fbc84 100755
--- a/platform/turris/agent/scripts/tdk_platform_utility.sh
+++ b/platform/turris/agent/scripts/tdk_platform_utility.sh
-@@ -37,17 +37,100 @@ getCMMACAddress()
+@@ -37,17 +37,104 @@ getCMMACAddress()
echo $macaddress
}
@@ -48,6 +48,8 @@
+{
+ if [ -e /etc/wireless/mediatek/mt7990.b0.dat ]; then
+ cat /etc/wireless/mediatek/mt7990.b0.dat | grep ^HT_BSSCoexistence | cut -d '=' -f2
++ elif [ -e /etc/wireless/mediatek/mt7992.b0.dat ]; then
++ cat /etc/wireless/mediatek/mt7992.b0.dat | grep ^HT_BSSCoexistence | cut -d '=' -f2
+ else
+ cat /nvram/hostapd0.conf | grep ^ht_coex | cut -d '=' -f2
+ fi
@@ -57,6 +59,8 @@
+{
+ if [ -e /etc/wireless/mediatek/mt7990.b1.dat ]; then
+ cat /etc/wireless/mediatek/mt7990.b1.dat | grep ^HT_BSSCoexistence | cut -d '=' -f2
++ elif [ -e /etc/wireless/mediatek/mt7992.b1.dat ]; then
++ cat /etc/wireless/mediatek/mt7992.b1.dat | grep ^HT_BSSCoexistence | cut -d '=' -f2
+ else
+ cat /nvram/hostapd1.conf | grep ^ht_coex | cut -d '=' -f2
+ fi
diff --git a/recipes-extended/tdkb/files/Set_properties_logan.sh b/recipes-extended/tdkb/files/Set_properties_logan.sh
index 62c646b..8d47435 100644
--- a/recipes-extended/tdkb/files/Set_properties_logan.sh
+++ b/recipes-extended/tdkb/files/Set_properties_logan.sh
@@ -30,8 +30,11 @@
devidx=$(($devidx + 1))
done
-
-echo "DEFAULT_CHANNEL_BANDWIDTH=40MHz,80MHz" >> /etc/tdk_platform.properties
+if [ -e /etc/wireless/mediatek/mt7992.b1.dat ]; then
+ echo "DEFAULT_CHANNEL_BANDWIDTH=40MHz,160MHz" >> /etc/tdk_platform.properties
+else
+ echo "DEFAULT_CHANNEL_BANDWIDTH=40MHz,80MHz" >> /etc/tdk_platform.properties
+fi
echo "RADIO_MODES_2G=n:11NGHT40MINUS:4,n:11NGHT40MINUS:8,ax:11AXHE40MINUS:32,ax:11AXHE40MINUS:0" >> /etc/tdk_platform.properties
echo "RADIO_MODES_5G=ac:11ACVHT80:16,n:11NAHT40MINUS:8,ax:11AXHE80:32,ax:11AXHE80:0" >> /etc/tdk_platform.properties
echo "getAp0DTIMInterval=1" >> /etc/tdk_platform.properties