[Feature] Merge MR0.5 from MTK
Change-Id: I77f817d2d58dfa7a69b4af32123f2929c724356e
diff --git a/src/kernel/linux/v4.19/net/ipv6/ndisc.c b/src/kernel/linux/v4.19/net/ipv6/ndisc.c
index cf5d003..987f8d1 100644
--- a/src/kernel/linux/v4.19/net/ipv6/ndisc.c
+++ b/src/kernel/linux/v4.19/net/ipv6/ndisc.c
@@ -1229,9 +1229,9 @@
*/
in6_dev->if_flags |= IF_RA_RCVD;
}
-
- if (sysctl_optr == MTK_IPV6_VZW_ALL ||
- sysctl_optr == MTK_IPV6_EX_RS_INTERVAL) {
+ if ((sysctl_optr == MTK_IPV6_VZW_ALL ||
+ sysctl_optr == MTK_IPV6_EX_RS_INTERVAL) &&
+ (strncmp(in6_dev->dev->name, "ccmni", 2) == 0)) {
/*add for VzW feature : remove IF_RS_VZW_SENT flag*/
if (in6_dev->if_flags & IF_RS_VZW_SENT)
in6_dev->if_flags &= ~IF_RS_VZW_SENT;