Permalink
Browse files

backup for sync w/ 3.6

- dccp/sctp do not compile
- carp does not compile
- "encif" symbol undefined (= GENERIC does not compile)
  • Loading branch information...
1 parent 2dad750 commit 398ea3fbb8413c069fd0f3deff4918e32cb654d1 itojun committed Nov 6, 2004
Showing 385 changed files with 4,072 additions and 93,190 deletions.
View
@@ -1,4 +1,4 @@
-/* $KAME: radix_mpath.c,v 1.15 2004/04/25 02:21:39 itojun Exp $ */
+/* $KAME: radix_mpath.c,v 1.16 2004/11/06 15:44:28 itojun Exp $ */
/*
* Copyright (C) 2001 WIDE Project.
@@ -120,10 +120,17 @@ rt_mpath_matchgate(rt, gate)
* check if we have the same key/mask/gateway on the table already.
*/
int
+#ifdef __OpenBSD__
+rt_mpath_conflict(rnh, rt, netmask, mpathok)
+#else
rt_mpath_conflict(rnh, rt, netmask)
+#endif
struct radix_node_head *rnh;
struct rtentry *rt;
struct sockaddr *netmask;
+#ifdef __OpenBSD__
+ int mpathok;
+#endif
{
struct radix_node *rn, *rn1;
struct rtentry *rt1;
@@ -199,6 +206,8 @@ rt_mpath_conflict(rnh, rt, netmask)
}
maskmatched:;
+ if (!mpathok)
+ return EEXIST;
/* key/mask were the same. compare gateway for all multipaths */
do {
@@ -1,4 +1,4 @@
-/* $KAME: radix_mpath.h,v 1.9 2004/03/30 11:21:49 keiichi Exp $ */
+/* $KAME: radix_mpath.h,v 1.10 2004/11/06 15:44:28 itojun Exp $ */
/*
* Copyright (C) 2001 WIDE Project.
@@ -47,8 +47,13 @@ int rn_mpath_capable __P((struct radix_node_head *));
struct radix_node *rn_mpath_next __P((struct radix_node *));
int rn_mpath_count __P((struct radix_node *));
struct rtentry *rt_mpath_matchgate __P((struct rtentry *, struct sockaddr *));
+#ifdef __OpenBSD__
+int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
+ struct sockaddr *, int));
+#else
int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
struct sockaddr *));
+#endif
void rtalloc_mpath __P((struct route *, int));
struct radix_node *rn_mpath_lookup __P((void *, void *,
struct radix_node_head *));
@@ -1,4 +1,4 @@
-/* $KAME: in6_ifattach.c,v 1.201 2004/08/17 10:18:58 jinmei Exp $ */
+/* $KAME: in6_ifattach.c,v 1.202 2004/11/06 15:44:28 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -41,8 +41,8 @@
#include <sys/sockio.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#if defined(__OpenBSD__)
-#include <sys/md5k.h>
+#ifdef __OpenBSD__
+#include <crypto/md5.h>
#else
#include <sys/md5.h>
#endif
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.48 2004/02/10 01:31:20 millert Exp $ */
+/* $OpenBSD: conf.c,v 1.50 2004/06/18 20:35:50 miod Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -40,6 +40,8 @@
#include <sys/conf.h>
#include <sys/vnode.h>
+#include "inet.h"
+
#include "wd.h"
bdev_decl(wd);
#include "fd.h"
@@ -126,6 +128,7 @@ cdev_decl(pci);
#endif
#include "systrace.h"
+#include "hotplug.h"
struct cdevsw cdevsw[] =
{
@@ -193,6 +196,8 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 53: ALTQ (deprecated) */
cdev_iop_init(NIOP, iop), /* 54: I2O IOP control interface */
cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */
+ cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
+ cdev_crypto_init(NCRYPTO,crypto), /* 57: /dev/crypto */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.86 2004/03/10 23:02:53 tom Exp $ */
+/* $OpenBSD: machdep.c,v 1.89 2004/07/06 21:53:59 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -191,9 +191,6 @@ struct user *proc0paddr;
/* Number of machine cycles per microsecond */
u_int64_t cycles_per_usec;
-/* number of cpus in the box. really! */
-int ncpus;
-
struct bootinfo_kernel bootinfo;
/* For built-in TCDS */
@@ -393,10 +390,9 @@ alpha_init(pfn, ptb, bim, bip, biv)
*/
(*platform.cons_init)();
-#ifdef DIAGNOSTIC
+#if 0
/* Paranoid sanity checking */
- /* We should always be running on the primary. */
assert(hwrpb->rpb_primary_cpu_id == alpha_pal_whami());
/*
@@ -760,7 +756,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
* Figure out the number of cpus in the box, from RPB fields.
* Really. We mean it.
*/
- for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
+ for (ncpus = 0, i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
struct pcs *pcsp;
pcsp = LOCATE_PCS(hwrpb, i);
@@ -2046,7 +2042,7 @@ delay(n)
: "i" (2), "0" (N));
}
-#if defined(COMPAT_OSF1) || 1 /* XXX */
+#if defined(COMPAT_OSF1)
void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *,
u_long, register_t *);
@@ -1,152 +0,0 @@
-/* $OpenBSD: intrcnt.h,v 1.5 1997/01/24 19:57:13 niklas Exp $ */
-/* $NetBSD: intrcnt.h,v 1.7 1996/11/16 23:11:57 cgd Exp $ */
-
-/*
- * Copyright (c) 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#define INTRNAMES_DEFINITION \
-/* 0x00 */ ASCIZ "clock"; \
- ASCIZ "isa irq 0"; \
- ASCIZ "isa irq 1"; \
- ASCIZ "isa irq 2"; \
- ASCIZ "isa irq 3"; \
- ASCIZ "isa irq 4"; \
- ASCIZ "isa irq 5"; \
- ASCIZ "isa irq 6"; \
- ASCIZ "isa irq 7"; \
- ASCIZ "isa irq 8"; \
- ASCIZ "isa irq 9"; \
- ASCIZ "isa irq 10"; \
- ASCIZ "isa irq 11"; \
- ASCIZ "isa irq 12"; \
- ASCIZ "isa irq 13"; \
- ASCIZ "isa irq 14"; \
-/* 0x10 */ ASCIZ "isa irq 15"; \
- ASCIZ "kn20aa irq 0"; \
- ASCIZ "kn20aa irq 1"; \
- ASCIZ "kn20aa irq 2"; \
- ASCIZ "kn20aa irq 3"; \
- ASCIZ "kn20aa irq 4"; \
- ASCIZ "kn20aa irq 5"; \
- ASCIZ "kn20aa irq 6"; \
- ASCIZ "kn20aa irq 7"; \
- ASCIZ "kn20aa irq 8"; \
- ASCIZ "kn20aa irq 9"; \
- ASCIZ "kn20aa irq 10"; \
- ASCIZ "kn20aa irq 11"; \
- ASCIZ "kn20aa irq 12"; \
- ASCIZ "kn20aa irq 13"; \
- ASCIZ "kn20aa irq 14"; \
-/* 0x20 */ ASCIZ "kn20aa irq 15"; \
- ASCIZ "kn20aa irq 16"; \
- ASCIZ "kn20aa irq 17"; \
- ASCIZ "kn20aa irq 18"; \
- ASCIZ "kn20aa irq 19"; \
- ASCIZ "kn20aa irq 20"; \
- ASCIZ "kn20aa irq 21"; \
- ASCIZ "kn20aa irq 22"; \
- ASCIZ "kn20aa irq 23"; \
- ASCIZ "kn20aa irq 24"; \
- ASCIZ "kn20aa irq 25"; \
- ASCIZ "kn20aa irq 26"; \
- ASCIZ "kn20aa irq 27"; \
- ASCIZ "kn20aa irq 28"; \
- ASCIZ "kn20aa irq 29"; \
- ASCIZ "kn20aa irq 30"; \
-/* 0x30 */ ASCIZ "kn20aa irq 31"; \
- ASCIZ "kn15 tc slot 0"; \
- ASCIZ "kn15 tc slot 1"; \
- ASCIZ "kn15 tc slot 2"; \
- ASCIZ "kn15 tc slot 3"; \
- ASCIZ "kn15 tc slot 4"; \
- ASCIZ "kn15 tc slot 5"; \
- ASCIZ "kn15 tcds"; \
- ASCIZ "kn15 ioasic"; \
- ASCIZ "kn15 sfb"; \
- ASCIZ "kn16 tc slot 0"; \
- ASCIZ "kn16 tc slot 1"; \
- ASCIZ "kn16 tcds"; \
- ASCIZ "kn16 ioasic"; \
- ASCIZ "kn16 sfb"; \
- ASCIZ "tcds esp 0"; \
-/* 0x40 */ ASCIZ "tcds esp 1"; \
- ASCIZ "ioasic le"; \
- ASCIZ "ioasic scc 0"; \
- ASCIZ "ioasic scc 1"; \
- ASCIZ "ioasic am79c30"; \
- ASCIZ "eb164 irq 0"; \
- ASCIZ "eb164 irq 1"; \
- ASCIZ "eb164 irq 2"; \
- ASCIZ "eb164 irq 3"; \
- ASCIZ "eb164 irq 4"; \
- ASCIZ "eb164 irq 5"; \
- ASCIZ "eb164 irq 6"; \
- ASCIZ "eb164 irq 7"; \
- ASCIZ "eb164 irq 8"; \
- ASCIZ "eb164 irq 9"; \
- ASCIZ "eb164 irq 10"; \
-/* 0x50 */ ASCIZ "eb164 irq 11"; \
- ASCIZ "eb164 irq 12"; \
- ASCIZ "eb164 irq 13"; \
- ASCIZ "eb164 irq 14"; \
- ASCIZ "eb164 irq 15"; \
- ASCIZ "eb164 irq 16"; \
- ASCIZ "eb164 irq 17"; \
- ASCIZ "eb164 irq 18"; \
- ASCIZ "eb164 irq 19"; \
- ASCIZ "eb164 irq 20"; \
- ASCIZ "eb164 irq 21"; \
- ASCIZ "eb164 irq 22"; \
- ASCIZ "eb164 irq 23";
-
-#define INTRCNT_DEFINITION \
-/* 0x00 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0; \
-/* 0x10 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0; \
-/* 0x20 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0; \
-/* 0x30 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0; \
-/* 0x40 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0; \
-/* 0x50 */ .quad 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;
-
-#define INTRCNT_CLOCK 0
-#define INTRCNT_ISA_IRQ (INTRCNT_CLOCK + 1)
-#define INTRCNT_ISA_IRQ_LEN 16
-#define INTRCNT_KN20AA_IRQ (INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN)
-#define INTRCNT_KN20AA_IRQ_LEN 32
-#define INTRCNT_KN15 (INTRCNT_KN20AA_IRQ + INTRCNT_KN20AA_IRQ_LEN)
-#define INTRCNT_KN15_LEN 9
-#define INTRCNT_KN16 (INTRCNT_KN15 + INTRCNT_KN15_LEN)
-#define INTRCNT_KN16_LEN 5
-#define INTRCNT_TCDS (INTRCNT_KN16 + INTRCNT_KN16_LEN)
-#define INTRCNT_TCDS_LEN 2
-#define INTRCNT_IOASIC (INTRCNT_TCDS + INTRCNT_TCDS_LEN)
-#define INTRCNT_IOASIC_LEN 4
-#define INTRCNT_EB164_IRQ (INTRCNT_IOASIC + INTRCNT_IOASIC_LEN)
-#define INTRCNT_EB164_IRQ_LEN 24
-
-#ifndef _LOCORE
-extern volatile long intrcnt[];
-#endif
Oops, something went wrong.

0 comments on commit 398ea3f

Please sign in to comment.