net: dhcpv6: remove MTK_DHCPV6C_WIFI feature

MTK extension MTK_DHCPV6C_WIFI is no longer necessary. Remove option
and functionality.

This reverts commit ccd52552b0ef ("HPV6: fix HPv6 onfig Error") and
4996bbf5c24b ("DHCPV6:Support DHCPV6 to Assign IPV6 Address")

Change-Id: I3a1ea546bd4006546a301e0fc0fed721ae5c507f
CR-Id: ALPS02210363
Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>

8 files changed, 0 insertions, 58 deletions

diff --git a/drivers/misc/mediatek/Kconfig.drivers b/drivers/misc/mediatek/Kconfig.drivers
index 9962ba0ba..be95ccb85 100644
--- a/drivers/misc/mediatek/Kconfig.drivers
+++ b/drivers/misc/mediatek/Kconfig.drivers
@@ -474,11 +474,6 @@ config MTK_BT_SUPPORT
 	  When this option set to yes, the MTK Bluetooth solution will be
 	  included.
 
-config MTK_DHCPV6C_WIFI
-	bool "MTK_DHCPV6C_WIFI"
-	help
-	  no: disable this feature
-
 config MTK_WFD_SUPPORT
 	bool "MTK_WFD_SUPPORT"
 	help
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index ae7756421..b1199a2cf 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -29,8 +29,6 @@ struct ipv6_devconf {
 	__s32		max_addresses;
 	__s32		accept_ra_defrtr;
 	__s32		accept_ra_pinfo;
-    /* MTK_DHCPV6C_WIFI	*/
-	__s32		ra_info_flag;	
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	__s32		accept_ra_rtr_pref;
 	__s32		rtr_probe_interval;
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index c2b6be490..e9d0f7efd 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -162,7 +162,6 @@ enum {
 	DEVCONF_NDISC_NOTIFY,
 	DEVCONF_ACCEPT_RA_RT_TABLE,
 	DEVCONF_USE_OPTIMISTIC,
-	DEVCONF_RA_INFO_FLAG,
 	DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
index 18f0aec9d..6d6721341 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -568,7 +568,6 @@ enum {
 	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
 	NET_IPV6_PROXY_NDP=23,
 	NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
-	NET_IPV6_RA_INFO_FLAG=26,
 	__NET_IPV6_MAX
 };
 
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index c1559f361..aea4a9ea6 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -523,9 +523,6 @@ static const struct bin_table bin_net_ipv6_conf_var_table[] = {
 	{ CTL_INT,	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,	"accept_ra_rt_info_max_plen" },
 	{ CTL_INT,	NET_IPV6_PROXY_NDP,			"proxy_ndp" },
 	{ CTL_INT,	NET_IPV6_ACCEPT_SOURCE_ROUTE,		"accept_source_route" },
-#ifdef CONFIG_MTK_DHCPV6C_WIFI	
-	{ CTL_INT,	NET_IPV6_RA_INFO_FLAG,		"ra_info_flag" },
-#endif
 	{}
 };
 
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 51239fcf9..96402065c 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -264,10 +264,5 @@ config IPV6_PIMSM_V2
 	  Support for IPv6 PIM multicast routing protocol PIM-SMv2.
 	  If unsure, say N.
 
-config MTK_DHCPV6C_WIFI
-	bool "dhcpv6 on wifi"
-	default y
-
-
 
 endif # IPV6
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index dcfc3bd4e..edad1ac1f 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -194,9 +194,6 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
 	.accept_ra_pinfo	= 1,
-#ifdef CONFIG_MTK_DHCPV6C_WIFI	
-	.ra_info_flag		= 0,
-#endif		
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
 	.rtr_probe_interval	= 60 * HZ,
@@ -232,9 +229,6 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
 	.accept_ra_pinfo	= 1,
-#ifdef CONFIG_MTK_DHCPV6C_WIFI	
-	.ra_info_flag		= 0,
-#endif	
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
 	.rtr_probe_interval	= 60 * HZ,
@@ -4299,9 +4293,6 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
 	array[DEVCONF_ACCEPT_DAD] = cnf->accept_dad;
 	array[DEVCONF_FORCE_TLLAO] = cnf->force_tllao;
 	array[DEVCONF_NDISC_NOTIFY] = cnf->ndisc_notify;
-#ifdef CONFIG_MTK_DHCPV6C_WIFI	
-	array[DEVCONF_RA_INFO_FLAG] = cnf->ra_info_flag;
-#endif	
 }
 
 static inline size_t inet6_ifla6_size(void)
@@ -5147,15 +5138,6 @@ static struct addrconf_sysctl_table
 			.mode           = 0644,
 			.proc_handler   = proc_dointvec
 		},
-#ifdef	CONFIG_MTK_DHCPV6C_WIFI	
-		{
-			.procname		= "ra_info_flag",
-			.data			= &ipv6_devconf.ra_info_flag,
-			.maxlen 		= sizeof(int),
-			.mode			= 0644,
-			.proc_handler	= proc_dointvec
-		},
-#endif
 		{
 			/* sentinel */
 		}
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index dd6703e99..864f05191 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1332,35 +1332,12 @@ skip_routeinfo:
 		}
 	}
 
-#ifdef CONFIG_MTK_DHCPV6C_WIFI
-	if (in6_dev->if_flags & IF_RA_OTHERCONF){
-		printk(KERN_INFO "[mtk_net][ipv6]receive RA with o bit!\n");
-		in6_dev->cnf.ra_info_flag = 1;
-	} 
-	if(in6_dev->if_flags & IF_RA_MANAGED){
-		printk(KERN_INFO "[mtk_net][ipv6]receive RA with m bit!\n");
-		in6_dev->cnf.ra_info_flag = 2;
-	}
-	if(in6_dev->cnf.ra_info_flag == 0){
-		printk(KERN_INFO "[mtk_net][ipv6]receive RA neither O nor M bit is set!\n");
-		in6_dev->cnf.ra_info_flag = 4;
-	}
-#endif
-
 	if (ndopts.nd_useropts) {
 		struct nd_opt_hdr *p;
 		for (p = ndopts.nd_useropts;
 		     p;
 		     p = ndisc_next_useropt(p, ndopts.nd_useropts_end)) {
 			ndisc_ra_useropt(skb, p);
-#ifdef CONFIG_MTK_DHCPV6C_WIFI
-			/* only clear ra_info_flag when O bit is set */
-			if (p->nd_opt_type == ND_OPT_RDNSS &&
-					in6_dev->if_flags & IF_RA_OTHERCONF) {
-				printk(KERN_INFO "[mtk_net][ipv6]RDNSS, ignore RA with o bit!\n");
-				in6_dev->cnf.ra_info_flag = 0;
-			} 
-#endif
 		}
 	}