From: dlg <dlg@openbsd.org>
Date: Thu, 11 Jan 2018 00:14:15 +0000 (+0000)
Subject: carp_ourether gets passed the parent interface, not the carp interface.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=45fe7dd6e734ab1d9dda64fbd62604d4d868a853;p=openbsd

carp_ourether gets passed the parent interface, not the carp interface.
---

diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index bcdf0457b6e..27ffc982178 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.323 2018/01/10 23:50:39 dlg Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.324 2018/01/11 00:14:15 dlg Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -1347,7 +1347,7 @@ carp_ourether(struct ifnet *ifp, u_int8_t *ena)
 	struct carp_softc *vh;
 
 	KERNEL_ASSERT_LOCKED(); /* touching if_carp + carp_vhosts */
-	KASSERT(ifp->if_type == IFT_CARP);
+	KASSERT(ifp->if_type != IFT_CARP);
 	cif = &ifp->if_carp;
 
 	SRPL_FOREACH_LOCKED(vh, cif, sc_list) {