From ff5c11fefda80b2b1c09de4b36b4fef952ef9017 Mon Sep 17 00:00:00 2001
From: rmh <rmh@FreeBSD.org>
Date: Mon, 14 Nov 2011 18:21:27 +0000
Subject: Remove a few bits of FreeBSD 2.x compatibility code.

Approved by:	kib (mentor)
---
 sys/dev/bktr/bktr_reg.h | 4 ----
 sys/kern/uipc_socket.c  | 3 ---
 sys/net/if_spppfr.c     | 6 +++---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 982fe2c..4a3af1a 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -717,10 +717,6 @@ struct bt848_card_sig {
 /* ioctl_cmd_t int on old versions, u_long on new versions */
 /***********************************************************/
 
-#if (__FreeBSD__ == 2)
-typedef int ioctl_cmd_t;
-#endif
-
 #if defined(__FreeBSD__)
 typedef u_long ioctl_cmd_t;
 #endif
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index bbd4fad..2a1bf7f 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -2828,7 +2828,6 @@ bad:
 	return (error);
 }
 
-/* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
 int
 soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 {
@@ -2877,7 +2876,6 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	return (0);
 }
 
-/* XXX; copyin sopt data into mbuf chain for (__FreeBSD__ < 3) routines. */
 int
 soopt_mcopyin(struct sockopt *sopt, struct mbuf *m)
 {
@@ -2906,7 +2904,6 @@ soopt_mcopyin(struct sockopt *sopt, struct mbuf *m)
 	return (0);
 }
 
-/* XXX; copyout mbuf chain data into soopt for (__FreeBSD__ < 3) routines. */
 int
 soopt_mcopyout(struct sockopt *sopt, struct mbuf *m)
 {
diff --git a/sys/net/if_spppfr.c b/sys/net/if_spppfr.c
index ca84656..ee5339e 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -25,7 +25,7 @@
 
 #include <sys/param.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__FreeBSD__)
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
@@ -45,7 +45,7 @@
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__FreeBSD__)
 #include <sys/random.h>
 #endif
 #include <sys/malloc.h>
@@ -149,7 +149,7 @@ struct arp_req {
 	unsigned short  ptarget2;
 } __packed;
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 && __FreeBSD_version < 501113
+#if defined(__FreeBSD__) && __FreeBSD_version < 501113
 #define	SPP_FMT		"%s%d: "
 #define	SPP_ARGS(ifp)	(ifp)->if_name, (ifp)->if_unit
 #else
-- 
cgit v1.1