On Fri, Mar 03, 2017 at 10:36:19AM +0100, Martin Pieuchot wrote:
> It's now unused and can die, ok?

OK bluhm@

> 
> Index: netinet/in_pcb.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/in_pcb.c,v
> retrieving revision 1.216
> diff -u -p -r1.216 in_pcb.c
> --- netinet/in_pcb.c  6 Oct 2016 19:09:08 -0000       1.216
> +++ netinet/in_pcb.c  3 Mar 2017 08:03:23 -0000
> @@ -316,8 +316,6 @@ in_pcbbind(struct inpcb *inp, struct mbu
>       switch (sotopf(so)) {
>  #ifdef INET6
>       case PF_INET6:
> -             if (TAILQ_EMPTY(&in6_ifaddr))
> -                     return (EADDRNOTAVAIL);
>               if (!IN6_IS_ADDR_UNSPECIFIED(&inp->inp_laddr6))
>                       return (EINVAL);
>               wild |= INPLOOKUP_IPV6;
> Index: netinet6/in6.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/in6.c,v
> retrieving revision 1.199
> diff -u -p -r1.199 in6.c
> --- netinet6/in6.c    16 Feb 2017 10:15:12 -0000      1.199
> +++ netinet6/in6.c    3 Mar 2017 08:03:07 -0000
> @@ -614,7 +614,6 @@ in6_update_ifa(struct ifnet *ifp, struct
>               ia6->ia_ifa.ifa_netmask = sin6tosa(&ia6->ia_prefixmask);
>  
>               ia6->ia_ifp = ifp;
> -             TAILQ_INSERT_TAIL(&in6_ifaddr, ia6, ia_list);
>               ia6->ia_addr = ifra->ifra_addr;
>               ifa_add(ifp, &ia6->ia_ifa);
>       }
> @@ -896,8 +895,6 @@ in6_unlink_ifa(struct in6_ifaddr *ia6, s
>       int plen;
>  
>       splsoftassert(IPL_SOFTNET);
> -
> -     TAILQ_REMOVE(&in6_ifaddr, ia6, ia_list);
>  
>       /* Release the reference to the base prefix. */
>       if (ia6->ia6_ndpr == NULL) {
> Index: netinet6/in6_var.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/in6_var.h,v
> retrieving revision 1.65
> diff -u -p -r1.65 in6_var.h
> --- netinet6/in6_var.h        9 Feb 2017 15:23:35 -0000       1.65
> +++ netinet6/in6_var.h        3 Mar 2017 08:02:35 -0000
> @@ -332,9 +332,6 @@ struct    in6_aliasreq {
>  #define IN6_ARE_SCOPE_CMP(a,b) ((a)-(b))
>  #define IN6_ARE_SCOPE_EQUAL(a,b) ((a)==(b))
>  
> -TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr);
> -extern struct in6_ifaddrhead in6_ifaddr;
> -
>  /*
>   * Multi-cast membership entry.  One for each group/ifp that a PCB
>   * belongs to.
> Index: netinet6/ip6_input.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/ip6_input.c,v
> retrieving revision 1.180
> diff -u -p -r1.180 ip6_input.c
> --- netinet6/ip6_input.c      28 Feb 2017 09:59:34 -0000      1.180
> +++ netinet6/ip6_input.c      3 Mar 2017 08:02:52 -0000
> @@ -114,7 +114,6 @@
>  #include <netinet/ip_carp.h>
>  #endif
>  
> -struct in6_ifaddrhead in6_ifaddr;
>  struct niqueue ip6intrq = NIQUEUE_INITIALIZER(IFQ_MAXLEN, NETISR_IPV6);
>  
>  struct cpumem *ip6counters;
> @@ -152,7 +151,6 @@ ip6_init(void)
>                   pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW &&
>                   pr->pr_protocol < IPPROTO_MAX)
>                       ip6_protox[pr->pr_protocol] = pr - inet6sw;
> -     TAILQ_INIT(&in6_ifaddr);
>       ip6_randomid_init();
>       nd6_init();
>       frag6_init();

Reply via email to