[src/trunk]: src/sys/net The bridge driver does all forwarding at interrupt l...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c07887e0e7b9
branches:  trunk
changeset: 515867:c07887e0e7b9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Oct 06 15:46:33 2001 +0000

description:
The bridge driver does all forwarding at interrupt level, and
does not use software interrupts; remove these bridge netisr
hooks left over from a previous incarnation of the bridge code.

Noted by Andrew Brown <atatat%atatdot.net@localhost>.

diffstat:

 sys/net/netisr.h          |  9 +--------
 sys/net/netisr_dispatch.h |  5 +----
 2 files changed, 2 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 922dd8d4912e -r c07887e0e7b9 sys/net/netisr.h
--- a/sys/net/netisr.h  Sat Oct 06 15:43:33 2001 +0000
+++ b/sys/net/netisr.h  Sat Oct 06 15:46:33 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr.h,v 1.28 2001/04/11 03:55:16 thorpej Exp $ */
+/* $NetBSD: netisr.h,v 1.29 2001/10/06 15:46:33 thorpej Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1989, 1993
@@ -61,7 +61,6 @@
 #include "opt_natm.h" 
 #include "arp.h"
 #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-#include "bridge.h"
 #include "sl.h"
 #include "strip.h"
 #include "ppp.h"
@@ -120,9 +119,6 @@
 #if NPPP > 0
 extern void pppnetisr(void);
 #endif
-#if NBRIDGE > 0
-extern void bridgenetisr(void);
-#endif
 #endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
 
 #endif /* !defined(_LOCORE) */
@@ -135,9 +131,6 @@
  * interrupt used for scheduling the network code to calls
  * on the lowest level routine of each protocol.
  */
-#ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-#define        NETISR_BRIDGE   0               /* for bridge processing */
-#endif
 #define        NETISR_IP       2               /* same as AF_INET */
 #define        NETISR_NS       6               /* same as AF_NS */
 #define        NETISR_ISO      7               /* same as AF_ISO */
diff -r 922dd8d4912e -r c07887e0e7b9 sys/net/netisr_dispatch.h
--- a/sys/net/netisr_dispatch.h Sat Oct 06 15:43:33 2001 +0000
+++ b/sys/net/netisr_dispatch.h Sat Oct 06 15:46:33 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr_dispatch.h,v 1.7 2001/04/14 13:54:38 augustss Exp $ */
+/* $NetBSD: netisr_dispatch.h,v 1.8 2001/10/06 15:46:33 thorpej Exp $ */
 
 /*
  * netisr_dispatch: This file is included by the 
@@ -57,6 +57,3 @@
 #if NPPP > 0 && !defined(__HAVE_GENERIC_SOFT_INTERRUPTS)
        DONETISR(NETISR_PPP,pppnetisr);
 #endif
-#if NBRIDGE > 0 && !defined(__HAVE_GENERIC_SOFT_INTERRUPTS)
-       DONETISR(NETISR_BRIDGE,bridgenetisr);
-#endif