summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2011-07-12 15:23:51 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2011-07-12 15:23:51 +0000
commitd6e666574d0002339b5b7995bc452d016016d87d (patch)
tree674b2133d46d1d73f560cfc286c026eb39a8ce46 /sys
parentc93992c647bb57fab8dba88da8988b1a78c75834 (diff)
break up a line of code that involved a decrement operator and macros
so it evaluates in the order we want. ok claudio@
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_gre.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 998248e4611..ce5956f180a 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.56 2011/07/09 00:47:18 henning Exp $ */
+/* $OpenBSD: if_gre.c,v 1.57 2011/07/12 15:23:50 jsg Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -764,7 +764,8 @@ gre_recv_keepalive(struct gre_softc *sc)
}
break;
case GRE_STATE_UP:
- sc->sc_ka_holdmax = MAX(sc->sc_ka_holdmax--, sc->sc_ka_cnt);
+ sc->sc_ka_holdmax--;
+ sc->sc_ka_holdmax = MAX(sc->sc_ka_holdmax, sc->sc_ka_cnt);
break;
}