From 365c219b8bd9a9801e07890f76314cd1bca17e40 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 3 Jun 2005 18:20:37 +0000 Subject: [PATCH] Remove spl*() in net/{altq,bpf.c,bridge,dummynet,ef,gif,gre,hostcache.c} and replace them with critical sections. [forced commit to correct message] --- sys/net/altq/altq_hfsc.c | 2 +- sys/net/altq/altq_priq.c | 2 +- sys/net/altq/altq_rmclass.c | 2 +- sys/net/altq/altq_rmclass_debug.h | 2 +- sys/net/altq/altq_subr.c | 2 +- sys/net/bpf.c | 2 +- sys/net/bridge/bridge.c | 2 +- sys/net/dummynet/ip_dummynet.c | 2 +- sys/net/ef/if_ef.c | 2 +- sys/net/gif/if_gif.c | 2 +- sys/net/gre/if_gre.c | 2 +- sys/net/hostcache.c | 2 +- sys/net/oldbridge/bridge.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/net/altq/altq_hfsc.c b/sys/net/altq/altq_hfsc.c index b3390dbf3b..828fdd0367 100644 --- a/sys/net/altq/altq_hfsc.c +++ b/sys/net/altq/altq_hfsc.c @@ -1,5 +1,5 @@ /* $KAME: altq_hfsc.c,v 1.25 2004/04/17 10:54:48 kjc Exp $ */ -/* $DragonFly: src/sys/net/altq/altq_hfsc.c,v 1.3 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/altq/altq_hfsc.c,v 1.4 2005/06/03 18:20:36 swildner Exp $ */ /* * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved. diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c index 9ca8d5aec2..e15c20ce81 100644 --- a/sys/net/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -1,5 +1,5 @@ /* $KAME: altq_priq.c,v 1.12 2004/04/17 10:54:48 kjc Exp $ */ -/* $DragonFly: src/sys/net/altq/altq_priq.c,v 1.3 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/altq/altq_priq.c,v 1.4 2005/06/03 18:20:36 swildner Exp $ */ /* * Copyright (C) 2000-2003 diff --git a/sys/net/altq/altq_rmclass.c b/sys/net/altq/altq_rmclass.c index 141ac3810f..c0c9ba57d5 100644 --- a/sys/net/altq/altq_rmclass.c +++ b/sys/net/altq/altq_rmclass.c @@ -1,5 +1,5 @@ /* $KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $ */ -/* $DragonFly: src/sys/net/altq/altq_rmclass.c,v 1.3 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/altq/altq_rmclass.c,v 1.4 2005/06/03 18:20:36 swildner Exp $ */ /* * Copyright (c) 1991-1997 Regents of the University of California. diff --git a/sys/net/altq/altq_rmclass_debug.h b/sys/net/altq/altq_rmclass_debug.h index b3dba244aa..99230e743c 100644 --- a/sys/net/altq/altq_rmclass_debug.h +++ b/sys/net/altq/altq_rmclass_debug.h @@ -1,5 +1,5 @@ /* $KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $ */ -/* $DragonFly: src/sys/net/altq/altq_rmclass_debug.h,v 1.2 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/altq/altq_rmclass_debug.h,v 1.3 2005/06/03 18:20:36 swildner Exp $ */ /* * Copyright (c) Sun Microsystems, Inc. 1998 All rights reserved. diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index 5881c71f7b..c6cc2cf839 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -1,5 +1,5 @@ /* $KAME: altq_subr.c,v 1.23 2004/04/20 16:10:06 itojun Exp $ */ -/* $DragonFly: src/sys/net/altq/altq_subr.c,v 1.4 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/altq/altq_subr.c,v 1.5 2005/06/03 18:20:36 swildner Exp $ */ /* * Copyright (C) 1997-2003 diff --git a/sys/net/bpf.c b/sys/net/bpf.c index dbf142456a..6c5b5dc7b6 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,7 +38,7 @@ * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bpf.c,v 1.26 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/bpf.c,v 1.27 2005/06/03 18:19:51 swildner Exp $ */ #include "use_bpf.h" diff --git a/sys/net/bridge/bridge.c b/sys/net/bridge/bridge.c index 708f713401..dca83711e8 100644 --- a/sys/net/bridge/bridge.c +++ b/sys/net/bridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.15 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.16 2005/06/03 18:20:36 swildner Exp $ */ /* diff --git a/sys/net/dummynet/ip_dummynet.c b/sys/net/dummynet/ip_dummynet.c index 70d9ee0410..d13ce1a19f 100644 --- a/sys/net/dummynet/ip_dummynet.c +++ b/sys/net/dummynet/ip_dummynet.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.24.2.22 2003/05/13 09:31:06 maxim Exp $ - * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.12 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.13 2005/06/03 18:20:36 swildner Exp $ */ #if !defined(KLD_MODULE) diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c index 0159b3d7eb..c5f7d60f11 100644 --- a/sys/net/ef/if_ef.c +++ b/sys/net/ef/if_ef.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $ - * $DragonFly: src/sys/net/ef/if_ef.c,v 1.15 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/ef/if_ef.c,v 1.16 2005/06/03 18:20:36 swildner Exp $ */ #include "opt_inet.h" diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index 50afe1a22b..0714c93ca4 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $ */ -/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.12 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.13 2005/06/03 18:20:36 swildner Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index 36448e0fc0..045c582bfa 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -1,6 +1,6 @@ /* $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.12 2005/06/03 18:04:14 swildner Exp $ */ +/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.13 2005/06/03 18:20:37 swildner Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c index 49d2f29c07..1cae193502 100644 --- a/sys/net/hostcache.c +++ b/sys/net/hostcache.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/hostcache.c,v 1.6.2.1 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/Attic/hostcache.c,v 1.6 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/Attic/hostcache.c,v 1.7 2005/06/03 18:19:51 swildner Exp $ */ #include diff --git a/sys/net/oldbridge/bridge.c b/sys/net/oldbridge/bridge.c index c99d3a5bca..f30aa07c28 100644 --- a/sys/net/oldbridge/bridge.c +++ b/sys/net/oldbridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.15 2005/06/03 18:04:14 swildner Exp $ + * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.16 2005/06/03 18:20:36 swildner Exp $ */ /* -- 2.41.0