From ddc06ac412646fd649c0ef6e8649b888e7cb4a2d Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Tue, 14 Dec 2004 01:59:08 +0000
Subject: move ioctls together w/ all other ifaces; mcbride@ ok

---
 sys/netinet/ip_carp.h | 4 +---
 sys/sys/sockio.h      | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 86a053770b6..0a83397183f 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.h,v 1.11 2004/12/10 22:35:17 mcbride Exp $	*/
+/*	$OpenBSD: ip_carp.h,v 1.12 2004/12/14 01:59:07 mickey Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -130,8 +130,6 @@ struct carpreq {
 	int		carpr_advbase;
 	unsigned char	carpr_key[CARP_KEY_LEN];
 };
-#define	SIOCSVH	_IOWR('i', 245, struct ifreq)
-#define	SIOCGVH	_IOWR('i', 246, struct ifreq)
 
 /*
  * Names for CARP sysctl objects
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index b59553e0fe0..26d89ef6963 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sockio.h,v 1.29 2004/10/11 10:13:49 henning Exp $	*/
+/*	$OpenBSD: sockio.h,v 1.30 2004/12/14 01:59:07 mickey Exp $	*/
 /*	$NetBSD: sockio.h,v 1.5 1995/08/23 00:40:47 thorpej Exp $	*/
 
 /*-
@@ -158,4 +158,7 @@
 #define	SIOCSIFTIMESLOT	 _IOW('i', 133, struct ifreq)	/* set ifnet timeslot */
 #define	SIOCGIFTIMESLOT	_IOWR('i', 134, struct ifreq)	/* get ifnet timeslot */
 
+#define	SIOCSVH		_IOWR('i', 245, struct ifreq)	/* set carp param */
+#define	SIOCGVH		_IOWR('i', 246, struct ifreq)	/* get carp param */
+
 #endif /* !_SYS_SOCKIO_H_ */
-- 
cgit v1.2.3