From c444cdded24766f5b1ff4efb363dba8882c925be Mon Sep 17 00:00:00 2001
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sat, 19 Nov 2005 14:01:32 +0000
Subject: [PATCH] Move MAX_IPOPTLEN and struct ipoption back into ip_var.h as
 userland programs depend on it.

Pointed out by:	le
Sponsored by:	TCP/IP Optimization Fundraise 2005
---
 sys/netinet/ip_options.h | 13 -------------
 sys/netinet/ip_var.h     | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/netinet/ip_options.h b/sys/netinet/ip_options.h
index b7c00500f8e..ed032c7d841 100644
--- a/sys/netinet/ip_options.h
+++ b/sys/netinet/ip_options.h
@@ -34,14 +34,6 @@
 #ifndef _NETINET_IP_OPTIONS_H_
 #define	_NETINET_IP_OPTIONS_H_
 
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN    40
-
 struct ipoptrt {
         struct  in_addr dst;                    /* final destination */
         char    nop;                            /* one NOP to align */
@@ -55,11 +47,6 @@ struct ipopt_tag {
 	struct	ipoptrt ip_srcrt;
 };
 
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
 extern	int	ip_doopts;		/* process or ignore IP options */
 
 int	ip_dooptions(struct mbuf *, int);
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 49a6f9a92f2..6d0a12218ea 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -65,6 +65,19 @@ struct ipq {
 };
 #endif /* _KERNEL */
 
+/*
+ * Structure stored in mbuf in inpcb.ip_options
+ * and passed to ip_output when ip options are in use.
+ * The actual length of the options (including ipopt_dst)
+ * is in m_len.
+ */
+#define MAX_IPOPTLEN	40
+
+struct ipoption {
+	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
+	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
+};
+
 /*
  * Structure attached to inpcb.ip_moptions and
  * passed to ip_output when IP multicast options are in use.