Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys revert previous, roy says it breaks DaD.



details:   https://anonhg.NetBSD.org/src/rev/f0e9e920ad9d
branches:  trunk
changeset: 347731:f0e9e920ad9d
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 13 15:57:50 2016 +0000

description:
revert previous, roy says it breaks DaD.

diffstat:

 sys/netinet/in.c   |  5 ++---
 sys/netinet6/in6.c |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 70fd24c120c8 -r f0e9e920ad9d sys/netinet/in.c
--- a/sys/netinet/in.c  Tue Sep 13 15:41:33 2016 +0000
+++ b/sys/netinet/in.c  Tue Sep 13 15:57:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $        */
+/*     $NetBSD: in.c,v 1.181 2016/09/13 15:57:50 christos Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.181 2016/09/13 15:57:50 christos Exp $");
 
 #include "arp.h"
 
@@ -1065,7 +1065,6 @@
         */
        oldaddr = ia->ia_addr;
        ia->ia_addr = *sin;
-       ia->ia4_flags = 0;
 
        /* Set IN_IFF flags early for if_addr_init() */
        if (hostIsNew && if_do_dad(ifp) && !in_nullhost(ia->ia_addr.sin_addr)) {
diff -r 70fd24c120c8 -r f0e9e920ad9d sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Tue Sep 13 15:41:33 2016 +0000
+++ b/sys/netinet6/in6.c        Tue Sep 13 15:57:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $       */
+/*     $NetBSD: in6.c,v 1.220 2016/09/13 15:57:50 christos Exp $       */
 /*     $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $   */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.220 2016/09/13 15:57:50 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1708,7 +1708,6 @@
        }
 
        ia->ia_addr = *sin6;
-       ia->ia6_flags = 0;
 
        if (ifacount <= 0 &&
            (error = if_addr_init(ifp, &ia->ia_ifa, true)) != 0) {



Home | Main Index | Thread Index | Old Index