From 2180b92513c7279bf211960b6cec975182cd3925 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Thu, 21 Sep 1995 17:50:45 +0000 Subject: [PATCH] Merge with 4.4-Lite-2. This is actually a 64-bit fix; the second parameter to in_control() is sometimes a pointer, and sometimes an integer, so use u_long rather than int. Obtained from: 4.4BSD-Lite-2 --- sys/netinet/in.c | 6 +++--- sys/netinet/in_var.h | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 51c073af344..d129182a12d 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)in.c 8.2 (Berkeley) 11/15/93 - * $Id: in.c,v 1.14 1995/05/30 08:09:26 rgrimes Exp $ + * @(#)in.c 8.4 (Berkeley) 1/9/95 + * $Id: in.c,v 1.15 1995/07/17 15:15:15 wollman Exp $ */ #include @@ -176,7 +176,7 @@ int in_interfaces; /* number of external internet interfaces */ int in_control(so, cmd, data, ifp) struct socket *so; - int cmd; + u_long cmd; caddr_t data; register struct ifnet *ifp; { diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index a21ec47468f..15c059ecf54 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)in_var.h 8.1 (Berkeley) 6/10/93 - * $Id: in_var.h,v 1.9 1995/03/23 18:14:41 wollman Exp $ + * @(#)in_var.h 8.2 (Berkeley) 1/9/95 + * $Id: in_var.h,v 1.10 1995/05/30 08:09:32 rgrimes Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -222,7 +222,8 @@ int in_ifinit __P((struct ifnet *, struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *)); void in_delmulti __P((struct in_multi *)); void in_ifscrub __P((struct ifnet *, struct in_ifaddr *)); -int in_control __P((struct socket *, int, caddr_t, struct ifnet *)); +int in_control __P((struct socket *, u_long, caddr_t, struct ifnet *)); -#endif -#endif +#endif /* KERNEL */ + +#endif /* _NETINET_IN_VAR_H_ */