summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-04-28 14:51:51 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-04-28 14:51:51 +0000
commite716351eb0e9bfcb44438ae06a8ad747ef3e0dec (patch)
treea2526dc39a03e2bb52e6378846494b2a16cecf1d
parentc76dc8d11b57d6fa195b8848e5d3bdc35eaf86ba (diff)
Make sure to overwrite sdl_type after calling ether_ifattach().
Fix a problem found by Johan Huldtgren, ok phessler@
-rw-r--r--sys/netinet/ip_carp.c3
1 files changed, 2 insertions, 1 deletions
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. */