Module Name: src
Committed By: pooka
Date: Wed Aug 11 11:06:42 UTC 2010
Modified Files:
src/sys/netinet: ip_carp.c
Log Message:
ahem, min -> max in previous
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.43 src/sys/netinet/ip_carp.c:1.44
--- src/sys/netinet/ip_carp.c:1.43 Wed Aug 11 09:36:44 2010
+++ src/sys/netinet/ip_carp.c Wed Aug 11 11:06:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.43 2010/08/11 09:36:44 pooka Exp $ */
+/* $NetBSD: ip_carp.c,v 1.44 2010/08/11 11:06:42 pooka Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -30,7 +30,7 @@
#include "opt_inet.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.43 2010/08/11 09:36:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.44 2010/08/11 11:06:42 pooka Exp $");
/*
* TODO:
@@ -1151,7 +1151,7 @@
arprequest(sc->sc_carpdev, in, in, CLLADDR(sc->sc_if.if_sadl));
/* XXX: why does this need to delay? */
- kpause("carpdel", false, MIN(1, mstohz(1)), NULL);
+ kpause("carpdel", false, MAX(1, mstohz(1)), NULL);
}
splx(s);
}
@@ -1175,7 +1175,7 @@
ND_NA_FLAG_OVERRIDE, 1, NULL);
/* XXX: why does this need to delay? */
- kpause("carpdel6", false, MIN(1, mstohz(1)), NULL);
+ kpause("carpdel6", false, MAX(1, mstohz(1)), NULL);
}
splx(s);
}
