diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/if_ether.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in_systm.h | 13 | ||||
| -rw-r--r-- | sys/netinet/in_var.h | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_fil.h | 4 | ||||
| -rw-r--r-- | sys/netinet/mlf_ipl.c | 4 |
6 files changed, 24 insertions, 11 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index ddd721ab..c744e7f 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.c,v 1.44 1998/03/30 09:52:40 phk Exp $ + * $Id: if_ether.c,v 1.45 1998/05/23 08:03:40 phk Exp $ */ /* @@ -104,7 +104,7 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, &arp_proxyall, 0, ""); static void arp_rtrequest __P((int, struct rtentry *, struct sockaddr *)); -static void arprequest __P((struct arpcom *, u_long *, u_long *, u_char *)); +static void arprequest __P((struct arpcom *, u_int32_t *, u_int32_t *, u_char *)); static void arpintr __P((void)); static void arptfree __P((struct llinfo_arp *)); static void arptimer __P((void *)); @@ -275,7 +275,7 @@ arp_rtrequest(req, rt, sa) static void arprequest(ac, sip, tip, enaddr) register struct arpcom *ac; - register u_long *sip, *tip; + register u_int32_t *sip, *tip; register u_char *enaddr; { register struct mbuf *m; diff --git a/sys/netinet/in.c b/sys/netinet/in.c index da4a1e6..4512106 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $Id: in.c,v 1.36 1997/10/11 18:31:31 phk Exp $ + * $Id: in.c,v 1.37 1997/10/12 20:25:23 phk Exp $ */ #include <sys/param.h> @@ -140,7 +140,7 @@ static int in_interfaces; /* number of external internet interfaces */ int in_control(so, cmd, data, ifp, p) struct socket *so; - int cmd; + u_long cmd; caddr_t data; register struct ifnet *ifp; struct proc *p; diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index d72e9b4..c536890 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_systm.h 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: in_systm.h,v 1.5 1997/02/22 09:41:30 peter Exp $ */ #ifndef _NETINET_IN_SYSTM_H_ @@ -51,10 +51,21 @@ * represent the types with the bytes in ``high-ender'' order. */ typedef u_short n_short; /* short as received from the net */ + +#ifdef __alpha__ + +typedef u_int n_long; /* long as received from the net */ + +typedef u_int n_time; /* ms since 00:00 GMT, byte rev */ + +#else + typedef u_long n_long; /* long as received from the net */ typedef u_long n_time; /* ms since 00:00 GMT, byte rev */ +#endif + #ifdef KERNEL n_time iptime __P((void)); #endif diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 9254904..5db83d0 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.2 (Berkeley) 1/9/95 - * $Id: in_var.h,v 1.27 1997/09/07 05:26:43 bde Exp $ + * $Id: in_var.h,v 1.28 1998/05/19 14:04:24 dg Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -214,7 +214,7 @@ do { \ struct route; struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *)); void in_delmulti __P((struct in_multi *)); -int in_control __P((struct socket *, int, caddr_t, struct ifnet *, +int in_control __P((struct socket *, u_long, caddr_t, struct ifnet *, struct proc *)); void in_rtqdrain __P((void)); void ip_input __P((struct mbuf *)); diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h index ecc5c3b..44a4cf2 100644 --- a/sys/netinet/ip_fil.h +++ b/sys/netinet/ip_fil.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_fil.h 1.35 6/5/96 - * $Id: ip_fil.h,v 1.1.1.5 1998/03/21 10:11:12 peter Exp $ + * $Id: ip_fil.h,v 1.2 1998/03/21 13:37:44 peter Exp $ */ #ifndef __IP_FIL_H__ @@ -382,7 +382,7 @@ extern int ipf_log __P((void)); extern void ipfr_fastroute __P((ip_t *, fr_info_t *, frdest_t *)); extern struct ifnet *get_unit __P((char *)); # define FR_SCANLIST(p, ip, fi, m) fr_scanlist(p, ip, fi, m) -# if defined(__NetBSD__) || defined(__OpenBSD__) || (_BSDI_VERSION >= 199701) +# if defined(__NetBSD__) || defined(__OpenBSD__) || (_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300003) extern int iplioctl __P((dev_t, u_long, caddr_t, int)); # else extern int iplioctl __P((dev_t, int, caddr_t, int)); diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c index 7a2cc70..d3abe3e 100644 --- a/sys/netinet/mlf_ipl.c +++ b/sys/netinet/mlf_ipl.c @@ -18,7 +18,9 @@ # include <osreldate.h> # define ACTUALLY_LKM_NOT_KERNEL # else -# define __FreeBSD_version 300000 /* this will do as a hack */ +# ifndef __FreeBSD_version +# define __FreeBSD_version 300000 /* this will do as a hack */ +# endif # endif #endif #include <sys/systm.h> |
