Module Name: src
Committed By: roy
Date: Thu Oct 6 11:13:57 UTC 2016
Modified Files:
src/usr.sbin/ifwatchd: ifwatchd.c
Log Message:
Inhibit initial up should only apply at program start, not for hot plugged
interfaces while it's running.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/ifwatchd/ifwatchd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ifwatchd/ifwatchd.c
diff -u src/usr.sbin/ifwatchd/ifwatchd.c:1.39 src/usr.sbin/ifwatchd/ifwatchd.c:1.40
--- src/usr.sbin/ifwatchd/ifwatchd.c:1.39 Thu Oct 6 11:08:55 2016
+++ src/usr.sbin/ifwatchd/ifwatchd.c Thu Oct 6 11:13:57 2016
@@ -1,6 +1,6 @@
-/* $NetBSD: ifwatchd.c,v 1.39 2016/10/06 11:08:55 roy Exp $ */
+/* $NetBSD: ifwatchd.c,v 1.40 2016/10/06 11:13:57 roy Exp $ */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ifwatchd.c,v 1.39 2016/10/06 11:08:55 roy Exp $");
+__RCSID("$NetBSD: ifwatchd.c,v 1.40 2016/10/06 11:13:57 roy Exp $");
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -470,8 +470,7 @@ check_carrier(const struct if_msghdr *if
* inhibit_initial is not set
*/
carrier_status = ifm->ifm_data.ifi_link_state;
- if ((carrier_status != p->last_carrier_status) ||
- ((p->last_carrier_status == -1) && !inhibit_initial)) {
+ if (carrier_status != p->last_carrier_status) {
switch (carrier_status) {
case LINK_STATE_UP:
ev = CARRIER;
@@ -506,7 +505,7 @@ check_announce(const struct if_announcem
break;
case IFAN_DEPARTURE:
p->index = -1;
- p->last_carrier_status = LINK_STATE_UNKNOWN;
+ p->last_carrier_status = -1;
invoke_script(p->ifname, DEPARTURE, NULL, NULL);
break;
default:
