diff options
| author | Yingjoe Chen <yingjoe.chen@mediatek.com> | 2015-10-16 13:59:13 +0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2016-12-19 10:39:03 +0100 |
| commit | 3adf0fffb1ee1c4d1d9647878ee15b88d0b564de (patch) | |
| tree | c9bf1d9fac3e34efc2c9daf1a7aabacd718c4fdd /net | |
| parent | 872455bc759cfe9c4f67293c1ee0d3dc7321e25b (diff) | |
| download | android_kernel_m2note-3adf0fffb1ee1c4d1d9647878ee15b88d0b564de.tar.gz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/Kconfig | 5 | ||||
| -rw-r--r-- | net/ipv6/addrconf.c | 18 | ||||
| -rw-r--r-- | net/ipv6/ndisc.c | 23 |
3 files changed, 0 insertions, 46 deletions
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 } } |