Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Simplify; clear then set flags to ia4_flags (NFCI)
details: https://anonhg.NetBSD.org/src/rev/227ee40a16ad
branches: trunk
changeset: 321787:227ee40a16ad
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Apr 06 09:19:16 2018 +0000
description:
Simplify; clear then set flags to ia4_flags (NFCI)
diffstat:
sys/netinet/in.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diffs (37 lines):
diff -r 95d62c7e5c44 -r 227ee40a16ad sys/netinet/in.c
--- a/sys/netinet/in.c Fri Apr 06 08:23:40 2018 +0000
+++ b/sys/netinet/in.c Fri Apr 06 09:19:16 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.223 2018/03/06 07:27:55 ozaki-r Exp $ */
+/* $NetBSD: in.c,v 1.224 2018/04/06 09:19:16 ozaki-r 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.223 2018/03/06 07:27:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.224 2018/04/06 09:19:16 ozaki-r Exp $");
#include "arp.h"
@@ -1143,14 +1143,12 @@
* We need to do this early because they maybe adjusted
* by if_addr_init depending on the address.
*/
- if (ia->ia4_flags & IN_IFF_DUPLICATED) {
- ia->ia4_flags &= ~IN_IFF_DUPLICATED;
+ if (ia->ia4_flags & IN_IFF_DUPLICATED)
hostIsNew = 1;
- }
- if (ifp->if_link_state == LINK_STATE_DOWN) {
+ ia->ia4_flags = 0;
+ if (ifp->if_link_state == LINK_STATE_DOWN)
ia->ia4_flags |= IN_IFF_DETACHED;
- ia->ia4_flags &= ~IN_IFF_TENTATIVE;
- } else if (hostIsNew && if_do_dad(ifp))
+ else if (hostIsNew && if_do_dad(ifp))
ia->ia4_flags |= IN_IFF_TRYTENTATIVE;
/*
Home |
Main Index |
Thread Index |
Old Index