d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a few bits of FreeBSD 2.x compatibility code.

Browse Source 
Approved by:	kib (mentor)
This commit is contained in:
Robert Millan 2011-11-14 18:21:27 +00:00
parent 7edec6214e
commit ea4d9a14f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=227503
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/bktr/bktr_reg.h
View File

@ -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

3
sys/kern/uipc_socket.c
View File

@ -2828,7 +2828,6 @@ sogetopt(struct socket *so, struct sockopt *sopt)
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)
{

6
sys/net/if_spppfr.c
View File

@ -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