diff options
| author | wollman <wollman@FreeBSD.org> | 1995-09-21 17:50:45 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-09-21 17:50:45 +0000 |
| commit | 6bdd60bf36b1d10b5705bee97186f0b3f6f9351b (patch) | |
| tree | fe24e67fd117f0500ff2556ae522d4066403e540 /sys/netinet/in.c | |
| parent | 0930d1478ee862c8421606bd3182b4503e073f74 (diff) | |
| download | FreeBSD-src-6bdd60bf36b1d10b5705bee97186f0b3f6f9351b.zip FreeBSD-src-6bdd60bf36b1d10b5705bee97186f0b3f6f9351b.tar.gz | |
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
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 51c073a..d129182 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 <sys/param.h> @@ -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; { |
