summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-10-28 20:34:21 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-10-28 20:34:21 +0000
commit902f30213b6aeae26f996f8b372051d1eb6972d8 (patch)
tree1e2d6d56f96d8ecfb2a183d5d22bd8fadb744d67
parentb55094580d972a7e468f45967c72bb4773bc8afb (diff)
define IFT_CARP, and set if_type to that on carp interfaces instead
of hiding under IFT_PROPVIRTUAL, ryan daniel ok
-rw-r--r--sys/net/if_types.h3
-rw-r--r--sys/netinet/ip_carp.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index d7a242d2d28..2c27331a7a6 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_types.h,v 1.15 2003/06/02 23:28:12 millert Exp $ */
+/* $OpenBSD: if_types.h,v 1.16 2004/10/28 20:34:20 henning Exp $ */
/* $NetBSD: if_types.h,v 1.17 2000/10/26 06:51:31 onoe Exp $ */
/*
@@ -265,5 +265,6 @@
#define IFT_ENC 0xf4 /* Encapsulation */
#define IFT_PFLOG 0xf5 /* Packet filter logging */
#define IFT_PFSYNC 0xf6 /* Packet filter state syncing */
+#define IFT_CARP 0xf7 /* Common Access Redundancy Protocol */
#endif /* _NET_IF_TYPES_H_ */
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 9efa52d988e..fb07e8bcb6c 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.67 2004/10/06 03:56:08 mcbride Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.68 2004/10/28 20:34:20 henning Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -651,7 +651,7 @@ carp_clone_create(ifc, unit)
ifp->if_ioctl = carp_ioctl;
ifp->if_output = looutput;
ifp->if_start = carp_start;
- ifp->if_type = IFT_PROPVIRTUAL;
+ ifp->if_type = IFT_CARP;
ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_hdrlen = 0;
if_attach(ifp);