diff options
| -rw-r--r-- | sys/netinet/in.c | 4 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 5 | ||||
| -rw-r--r-- | sys/netinet/tcp_input.c | 3 | ||||
| -rw-r--r-- | sys/netinet/tcp_reass.c | 3 | ||||
| -rw-r--r-- | sys/pci/ncr.c | 5 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.c | 6 |
6 files changed, 15 insertions, 11 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 9aa8ddb..c36b0fe 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.2 (Berkeley) 11/15/93 - * $Id: in.c,v 1.7 1994/11/03 21:04:21 wollman Exp $ + * $Id: in.c,v 1.8 1994/12/22 21:56:22 wollman Exp $ */ #include <sys/param.h> @@ -50,6 +50,8 @@ #include <netinet/in_var.h> #include <netinet/if_ether.h> +#include <netinet/igmp_var.h> + /* * Return the network number from an internet address. */ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index ac1afaa..4fcc900 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94 - * $Id: raw_ip.c,v 1.13 1995/01/26 18:59:02 wollman Exp $ + * $Id: raw_ip.c,v 1.14 1995/02/07 02:53:14 wollman Exp $ */ #include <sys/param.h> @@ -239,7 +239,8 @@ rip_ctloutput(op, so, level, optname, m) return(EINVAL); } - if (op = PRCO_SETOPT) { + op = PRCO_SETOPT; + if (op) { error=(*ip_acct_ctl_ptr)(optname, *m); if (*m) (void)m_free(*m); diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 306c256..d0a2195 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 - * $Id: tcp_input.c,v 1.11 1995/02/09 23:13:23 wollman Exp $ + * $Id: tcp_input.c,v 1.12 1995/02/14 02:35:16 wollman Exp $ */ #ifndef TUBA_INCLUDE @@ -2064,7 +2064,6 @@ tcp_mss(tp, offer) extern int tcp_do_rfc1644; #endif extern int tcp_mssdflt; - extern int tcp_do_rfc1323; inp = tp->t_inpcb; if ((rt = tcp_rtlookup(inp)) == NULL) { diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 306c256..d0a2195 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 - * $Id: tcp_input.c,v 1.11 1995/02/09 23:13:23 wollman Exp $ + * $Id: tcp_input.c,v 1.12 1995/02/14 02:35:16 wollman Exp $ */ #ifndef TUBA_INCLUDE @@ -2064,7 +2064,6 @@ tcp_mss(tp, offer) extern int tcp_do_rfc1644; #endif extern int tcp_mssdflt; - extern int tcp_do_rfc1323; inp = tp->t_inpcb; if ((rt = tcp_rtlookup(inp)) == NULL) { diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 2472f7d..ff85939 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.19 1995/02/06 22:01:58 se Exp $ +** $Id: ncr.c,v 1.20 1995/02/10 13:24:52 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -179,6 +179,7 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> +#include <machine/clock.h> /*========================================================== @@ -1227,7 +1228,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.19 1995/02/06 22:01:58 se Exp $\n"; + "\n$Id: ncr.c,v 1.20 1995/02/10 13:24:52 se Exp $\n"; u_long ncr_version = NCR_VERSION + (u_long) sizeof (struct ncb) diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 275e770..52152b3 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.c,v 1.17 1994/12/18 18:48:39 phk Exp $ + * $Id: scsiconf.c,v 1.18 1995/01/08 13:38:33 dufault Exp $ */ #include <sys/types.h> @@ -25,6 +25,7 @@ #include <sys/malloc.h> #include <sys/devconf.h> #include <sys/conf.h> +#include <machine/clock.h> #include "st.h" #include "sd.h" @@ -85,6 +86,8 @@ extern kil_attach(); extern ukattach(); #endif /* NUK */ +errval scsi_probe_bus(int, int, int); + /* * One of these is allocated and filled in for each scsi bus. * it holds pointers to allow the scsi bus to get to the driver @@ -342,7 +345,6 @@ static struct scsidevs knowndevs[] = struct predefined *scsi_get_predef(); struct scsidevs *scsi_probedev(); struct scsidevs *selectdev(); -errval scsi_probe_bus __P((int bus, int targ, int lun)); struct scsi_device probe_switch = { |
