merge in tahoe

[unix-history] / usr / src / sys / net / netisr.h

diff --git a/usr/src/sys/net/netisr.h b/usr/src/sys/net/netisr.h
index e653e2e..dafd006 100644 (file)
--- a/usr/src/sys/net/netisr.h
+++ b/usr/src/sys/net/netisr.h
@@ -1,4 +1,10 @@
-/*     netisr.h        6.1     83/07/29        */
+/*
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)netisr.h    7.2 (Berkeley) %G%
+ */

 
 /*
  * The networking code runs off software interrupts.
 
 /*
  * The networking code runs off software interrupts.


@@ -8,7 +14,7 @@
  * level for the clock (so you can enter the network in routines called
  * at timeout time).
  */
  * level for the clock (so you can enter the network in routines called
  * at timeout time).
  */

-#ifdef vax
+#if defined(vax) || defined(tahoe)

 #define        setsoftnet()    mtpr(SIRR, 12)
 #endif
 
 #define        setsoftnet()    mtpr(SIRR, 12)
 #endif
 


@@ -20,8 +26,8 @@
  */
 #define        NETISR_RAW      0               /* same as AF_UNSPEC */
 #define        NETISR_IP       2               /* same as AF_INET */
  */
 #define        NETISR_RAW      0               /* same as AF_UNSPEC */
 #define        NETISR_IP       2               /* same as AF_INET */

+#define        NETISR_IMP      3               /* same as AF_IMPLINK */

 #define        NETISR_NS       6               /* same as AF_NS */
 #define        NETISR_NS       6               /* same as AF_NS */

-#define        NETISR_ND       7               /* network disk protocol */

 
 #define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }
 
 
 #define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }