Merge "[Bugfix][T106BUG-424]After rndis used the network, the T106 sleep was repeatedly awakened"
diff --git a/ap/app/zte_comm/wlan/src/wlan_main.c b/ap/app/zte_comm/wlan/src/wlan_main.c
index daac630..aad2f8b 100755
--- a/ap/app/zte_comm/wlan/src/wlan_main.c
+++ b/ap/app/zte_comm/wlan/src/wlan_main.c
@@ -2028,6 +2028,12 @@
MSG_BUF wlanMsg={0};
int threadid = 0;
char wifiEnabled[8] = {0};
+//zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 start
+ char wifiAvailable[8] = {0};
+ sc_cfg_get ("wifiAvailable", wifiAvailable, sizeof (wifiAvailable));
+ if (!strcmp (wifiAvailable, "0"))
+ return -1;
+//zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 start
prctl(PR_SET_NAME, "wlan", 0, 0, 0);
//the first step, log and envirenment init
loglevel_init();
diff --git a/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c b/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
index 79cbb75..e48b6b8 100755
--- a/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
+++ b/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
@@ -456,17 +456,19 @@
}
}
}else{
-#if 0
- if(is_multicast_ether_addr(skb_mac_header(skb))){
+//zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 start
+#if 1
+ if(is_multicast_ether_addr(skb_mac_header(skb)) && skb->indev == NULL){
if(pcu_CoreIsActive(2) == 0){
net->stats.tx_errors++;
net->stats.tx_dropped++;
- zv_err("cap psm zvnet drop arp?");
+ //zv_err("cap psm zvnet drop arp?");
kfree_skb(skb);
return NET_XMIT_SUCCESS;
}
}
#endif
+//zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 end
}
}
if(unlikely(skb->capHead || skb->next || skb->fclone || skb->cloned
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
index 3666046..2082564 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
@@ -437,6 +437,9 @@
wifi_sta_connection=0
wifi_wps_index=1
wifiEnabled=1
+#zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 start
+wifiAvailable=1
+#zw.wang After rndis used the network, the T106 sleep was repeatedly awakened on 20240429 end
wifilan=wlan0-va0
wifilan2=wlan0-va1
WirelessMode=6