mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Nuke a whole bunch of commons; ok tedu (still more to come *sigh*)

Browse Source
This commit is contained in:
jason 2003-05-12 00:48:52 +00:00
parent 58b6b035db
commit a57e2087f9
11 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ic/mpuvar.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mpuvar.h,v 1.4 2002/11/28 22:37:20 mickey Exp $ */
/* $OpenBSD: mpuvar.h,v 1.5 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: mpu401var.h,v 1.3 1998/11/25 22:17:06 augustss Exp $ */
/*
@ -46,7 +46,7 @@ struct mpu_softc {
void *arg; /* arg for intr() */
};
struct midi_hw_if mpu_midi_hw_if;
extern struct midi_hw_if mpu_midi_hw_if;
int mpu_intr(void *);
int mpu_find(void *);

4
sys/kern/sysv_shm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sysv_shm.c,v 1.34 2003/04/14 04:53:50 art Exp $ */
/* $OpenBSD: sysv_shm.c,v 1.35 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */
/*
@ -76,7 +76,7 @@
#include <uvm/uvm_extern.h>
struct shminfo shminfo;
extern struct shminfo shminfo;
struct shmid_ds **shmsegs; /* linear mapping of shmid -> shmseg */
struct pool shm_pool;
unsigned short *shmseqs; /* array of shm sequence numbers */

4
sys/kern/uipc_domain.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: uipc_domain.c,v 1.13 2002/03/14 01:27:05 millert Exp $ */
/* $OpenBSD: uipc_domain.c,v 1.14 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */
/*
@ -49,6 +49,8 @@
#include <sys/sysctl.h>
#include <sys/timeout.h>
struct domain *domains;
void pffasttimo(void *);
void pfslowtimo(void *);
#if defined (KEY) || defined (IPSEC)

3
sys/net/if.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: if.c,v 1.64 2002/09/11 05:38:47 itojun Exp $ */
/* $OpenBSD: if.c,v 1.65 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@ -116,6 +116,7 @@ int if_mark_ignore(struct radix_node *, void *);
int if_mark_unignore(struct radix_node *, void *);
int ifqmaxlen = IFQ_MAXLEN;
int netisr;
void if_detached_start(struct ifnet *);
int if_detached_ioctl(struct ifnet *, u_long, caddr_t);

4
sys/net/netisr.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: netisr.h,v 1.17 2002/03/14 01:27:09 millert Exp $ */
/* $OpenBSD: netisr.h,v 1.18 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */
/*
@ -72,7 +72,7 @@
#ifndef _LOCORE
#ifdef _KERNEL
int netisr; /* scheduling bits for network */
extern int netisr; /* scheduling bits for network */
void arpintr(void);
void ipintr(void);

4
sys/netinet/tcp_seq.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tcp_seq.h,v 1.3 2001/06/09 07:03:43 angelos Exp $ */
/* $OpenBSD: tcp_seq.h,v 1.4 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: tcp_seq.h,v 1.6 1995/03/26 20:32:35 jtc Exp $ */
/*
@ -64,6 +64,6 @@
#define TCP_ISSINCR (125*1024) /* increment for tcp_iss each second */
#ifdef _KERNEL
tcp_seq tcp_iss; /* tcp initial send seq # */
extern tcp_seq tcp_iss; /* tcp initial send seq # */
#endif /* _KERNEL */
#endif /* _NETINET_TCP_SEQ_H_ */

5
sys/netinet/tcp_subr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tcp_subr.c,v 1.65 2002/08/28 15:43:03 pefo Exp $ */
/* $OpenBSD: tcp_subr.c,v 1.66 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
@ -136,6 +136,8 @@ int tcp_do_sack = TCP_DO_SACK; /* RFC 2018 selective ACKs */
int tcp_ack_on_push = 0; /* set to enable immediate ACK-on-PUSH */
int tcp_do_ecn = 0; /* RFC3168 ECN enabled/disabled? */
u_int32_t tcp_now;
#ifndef TCBHASHSIZE
#define TCBHASHSIZE 128
#endif
@ -153,6 +155,7 @@ struct pool sackhl_pool;
int tcp_freeq(struct tcpcb *);
struct tcpstat tcpstat; /* tcp statistics */
tcp_seq tcp_iss;
/*
* Tcp initialization

4
sys/netinet/tcp_var.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tcp_var.h,v 1.45 2003/02/12 14:41:08 jason Exp $ */
/* $OpenBSD: tcp_var.h,v 1.46 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */
/*
@ -371,7 +371,7 @@ struct tcp_ident_mapping {
#ifdef _KERNEL
extern struct inpcbtable tcbtable; /* head of queue of active tcpcb's */
extern struct tcpstat tcpstat; /* tcp statistics */
u_int32_t tcp_now; /* for RFC 1323 timestamps */
extern u_int32_t tcp_now; /* for RFC 1323 timestamps */
extern int tcp_do_rfc1323; /* enabled/disabled? */
extern int tcp_mssdflt; /* default maximum segment size */
extern int tcp_ack_on_push; /* ACK immediately on PUSH */

4
sys/netinet/udp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: udp_usrreq.c,v 1.86 2002/08/28 15:43:03 pefo Exp $ */
/* $OpenBSD: udp_usrreq.c,v 1.87 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@ -108,6 +108,8 @@ extern int ip6_defhlim;
*/
int udpcksum = 1;
struct inpcbtable udbtable;
struct udpstat udpstat;
static void udp_detach(struct inpcb *);
static void udp_notify(struct inpcb *, int);

6
sys/netinet/udp_var.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: udp_var.h,v 1.13 2002/03/14 01:27:11 millert Exp $ */
/* $OpenBSD: udp_var.h,v 1.14 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $ */
/*
@ -92,8 +92,8 @@ struct udpstat {
}
#ifdef _KERNEL
struct inpcbtable udbtable;
struct udpstat udpstat;
extern struct inpcbtable udbtable;
extern struct udpstat udpstat;
#if defined(INET6) && !defined(TCP6)
void udp6_ctlinput(int, struct sockaddr *, void *);

4
sys/sys/domain.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: domain.h,v 1.6 2002/05/27 11:47:00 itojun Exp $ */
/* $OpenBSD: domain.h,v 1.7 2003/05/12 00:48:52 jason Exp $ */
/* $NetBSD: domain.h,v 1.10 1996/02/09 18:25:07 christos Exp $ */
/*
@ -66,6 +66,6 @@ struct domain {
};
#ifdef _KERNEL
struct domain *domains;
extern struct domain *domains;
void domaininit(void);
#endif