commit 8f63d8dd6f7b5a23df558b04e95d700c28db5aee
author lh <lh@exm.com> Fri Jul 28 12:27:27 2023 +0800
committer Gerrit Code Review <jenkins2@jenkins2-Vostro-3690> Fri Jul 28 12:27:27 2023 +0800
tree 53667bdcc50d24f86cdc44c3b1eb3b304a881672
parent 1f9f15454821abd47c6f9067d69cecb6a92c9575
parent c82e309b09383748d837c06e9a556d83ac56ebcd

Merge "[Bugfix][API-1099]occasionally,setup data call fail,due to tele-fwk can not get mccmnc <new solution> 2" into GSW3.0-No-Connman

meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb

diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
index 32334f2..2c877ee 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
@@ -150,6 +150,7 @@
     cp ${STAGING_DIR_HOST}/${datadir}/init/* ${IMAGE_ROOTFS}/${datadir}/init/
     mkdir -p ${IMAGE_ROOTFS}/${datadir}/wg870/
     cp ${STAGING_DIR_HOST}/${datadir}/wg870/wifi_network ${IMAGE_ROOTFS}/${datadir}/wg870/
+    rm ${IMAGE_ROOTFS}/lib/systemd/system/sound.target.wants/alsa-restore.service
 }
 
 ROOTFS_POSTPROCESS_COMMAND += "mk_oem_init_part_rootfs_post;"

src/lynq/lib/liblynq-wifi6/libwifi6.c

diff --git a/src/lynq/lib/liblynq-wifi6/libwifi6.c b/src/lynq/lib/liblynq-wifi6/libwifi6.c
index 76c5d94..b0dc78b 100755
--- a/src/lynq/lib/liblynq-wifi6/libwifi6.c
+++ b/src/lynq/lib/liblynq-wifi6/libwifi6.c
@@ -1371,6 +1371,18 @@
                 *p = '\0';
             }
             return 0;
+        }else{
+            usleep( 10 * 1000);
+            ret = exec_cmd(cmd, hostname, 32);
+            if( ret == 0)
+            {
+                p= strchr(hostname, '\n');
+                if(p != NULL )
+                {
+                   *p = '\0';
+                }
+                return 0;
+            }
         }
         hostname[0] = '\0';
         RLOGE("---gethostbyaddr fail\n");