From: mpi <mpi@openbsd.org>
Date: Tue, 28 Apr 2015 14:51:50 +0000 (+0000)
Subject: Make sure to overwrite sdl_type after calling ether_ifattach().
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4952bf47fc7ce0b0172774fe28d6dfabfc8c7723;p=openbsd

Make sure to overwrite sdl_type after calling ether_ifattach().

Fix a problem found by Johan Huldtgren, ok phessler@
---

diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 7dd8dca5d15..07d5d6f557a 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.253 2015/04/22 06:44:17 mpi Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.254 2015/04/28 14:51:50 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -750,6 +750,7 @@ carp_clone_create(ifc, unit)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 	ifp->if_type = IFT_CARP;
+	ifp->if_sadl->sdl_type = IFT_CARP;
 	ifp->if_output = carp_output;
 
 	/* Hook carp_addr_updated to cope with address and route changes. */