Since this backward compat' is here we can now assume that applications
have been updated to not set the IN6_IFF_DEPRECATED.  At least our base
is clean and I doubt any port still do that.

Ok?

Index: netinet6/in6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6.c,v
retrieving revision 1.161
diff -u -p -r1.161 in6.c
--- netinet6/in6.c      18 Jul 2015 15:05:32 -0000      1.161
+++ netinet6/in6.c      10 Aug 2015 20:38:52 -0000
@@ -469,6 +469,7 @@ in6_control(struct socket *so, u_long cm
                if ((ifra->ifra_flags & IN6_IFF_DUPLICATED) != 0 ||
                    (ifra->ifra_flags & IN6_IFF_DETACHED) != 0 ||
                    (ifra->ifra_flags & IN6_IFF_NODAD) != 0 ||
+                   (ifra->ifra_flags & IN6_IFF_DEPRECATED) != 0 ||
                    (ifra->ifra_flags & IN6_IFF_AUTOCONF) != 0) {
                        return (EINVAL);
                }
@@ -759,14 +760,6 @@ in6_update_ifa(struct ifnet *ifp, struct
         * configure address flags.
         */
        ia6->ia6_flags = ifra->ifra_flags;
-       /*
-        * backward compatibility - if IN6_IFF_DEPRECATED is set from the
-        * userland, make it deprecated.
-        */
-       if ((ifra->ifra_flags & IN6_IFF_DEPRECATED) != 0) {
-               ia6->ia6_lifetime.ia6t_pltime = 0;
-               ia6->ia6_lifetime.ia6t_preferred = time_second;
-       }
        /*
         * Make the address tentative before joining multicast addresses,
         * so that corresponding MLD responses would not have a tentative

Reply via email to