diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 22:30:53 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 22:30:53 +0000 |
| commit | 35a125282d2999b4fd6dea7bbf4696f937f5a052 (patch) | |
| tree | 16c80ae6c1294751a0c34c39af0d4e9cd3a77d60 /sys/netinet/in.c | |
| parent | 4f317e580dfce2348ec5cfc05dfde20ed8440910 (diff) | |
From NetBSD: 960217 merge
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 2fcda154006..5de33584784 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,5 @@ -/* $NetBSD: in.c,v 1.25 1995/08/12 23:59:32 mycroft Exp $ */ +/* $OpenBSD: in.c,v 1.2 1996/03/03 22:30:28 niklas Exp $ */ +/* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1991, 1993 @@ -41,6 +42,7 @@ #include <sys/malloc.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/systm.h> #include <net/if.h> #include <net/route.h> @@ -50,6 +52,7 @@ #include <netinet/in_var.h> #include <netinet/if_ether.h> #include <netinet/ip_mroute.h> +#include <netinet/igmp_var.h> #include "ether.h" @@ -138,7 +141,6 @@ in_control(so, cmd, data, ifp) { register struct ifreq *ifr = (struct ifreq *)data; register struct in_ifaddr *ia = 0; - register struct ifaddr *ifa; struct in_aliasreq *ifra = (struct in_aliasreq *)data; struct sockaddr_in oldaddr; int error, hostIsNew, maskIsNew; @@ -348,7 +350,7 @@ in_ifinit(ifp, ia, sin, scrub) { register u_int32_t i = sin->sin_addr.s_addr; struct sockaddr_in oldaddr; - int s = splimp(), flags = RTF_UP, error, ether_output(); + int s = splimp(), flags = RTF_UP, error; oldaddr = ia->ia_addr; ia->ia_addr = *sin; @@ -525,7 +527,7 @@ in_addmulti(ap, ifp) /* * Delete a multicast address record. */ -int +void in_delmulti(inm) register struct in_multi *inm; { |