summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2015-11-18 10:31:12 -0600
committerMatt Smith <mgsmith@netgate.com>2015-11-18 10:31:12 -0600
commitf3e10164b29d4ece9c857db0a44aec0fea02c35b (patch)
treec3cff033dafbb0515b99b253fc1690758f380320
parenteb5f5eba05394f8400a4e5a598bbee16c65724c9 (diff)
downloadFreeBSD-src-f3e10164b29d4ece9c857db0a44aec0fea02c35b.zip
FreeBSD-src-f3e10164b29d4ece9c857db0a44aec0fea02c35b.tar.gz
Importing pfSense patch carp_fix_set_advskew_to_0.diff
-rw-r--r--sys/netinet/ip_carp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 423d0cc..03b29d5 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1706,13 +1706,11 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td)
}
sc->sc_advbase = carpr.carpr_advbase;
}
- if (carpr.carpr_advskew > 0) {
- if (carpr.carpr_advskew >= 255) {
- error = EINVAL;
- break;
- }
- sc->sc_advskew = carpr.carpr_advskew;
+ if (carpr.carpr_advskew >= 255) {
+ error = EINVAL;
+ break;
}
+ sc->sc_advskew = carpr.carpr_advskew;
if (carpr.carpr_key[0] != '\0') {
bcopy(carpr.carpr_key, sc->sc_key, sizeof(sc->sc_key));
carp_hmac_prepare(sc);
OpenPOWER on IntegriCloud