svn commit: r227503 - in head/sys: dev/bktr kern net

[Robert Millan]

Author: rmh
Date: Mon Nov 14 18:21:27 2011
New Revision: 227503
URL: http://svn.freebsd.org/changeset/base/227503

Log:
  Remove a few bits of FreeBSD 2.x compatibility code.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/dev/bktr/bktr_reg.h
  head/sys/kern/uipc_socket.c
  head/sys/net/if_spppfr.c

Modified: head/sys/dev/bktr/bktr_reg.h
==============================================================================
--- head/sys/dev/bktr/bktr_reg.h	Mon Nov 14 18:00:15 2011	(r227502)
+++ head/sys/dev/bktr/bktr_reg.h	Mon Nov 14 18:21:27 2011	(r227503)
@@ -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

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Mon Nov 14 18:00:15 2011	(r227502)
+++ head/sys/kern/uipc_socket.c	Mon Nov 14 18:21:27 2011	(r227503)
@@ -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 
 	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, stru
 	return (0);
 }
 
-/* XXX; copyout mbuf chain data into soopt for (__FreeBSD__ < 3) routines. */
 int
 soopt_mcopyout(struct sockopt *sopt, struct mbuf *m)
 {

Modified: head/sys/net/if_spppfr.c
==============================================================================
--- head/sys/net/if_spppfr.c	Mon Nov 14 18:00:15 2011	(r227502)
+++ head/sys/net/if_spppfr.c	Mon Nov 14 18:21:27 2011	(r227503)
@@ -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