Latest fixes from Nesheim@cornell

[unix-history] / usr / src / sys / netinet / in_systm.h

diff --git a/usr/src/sys/netinet/in_systm.h b/usr/src/sys/netinet/in_systm.h
index dea0cbe..4e452fe 100644 (file)
--- a/usr/src/sys/netinet/in_systm.h
+++ b/usr/src/sys/netinet/in_systm.h
@@ -1,4 +1,10 @@
-/* in_systm.h 4.9 82/04/11 */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)in_systm.h  6.2 (Berkeley) %G%
+ */

 
 /*
  * Miscellaneous internetwork
 
 /*
  * Miscellaneous internetwork


@@ -20,47 +26,8 @@ typedef u_long       n_long;                 /* long as received from the net */
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 #endif
 
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 #endif
 

-/*
- * The internet code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).  Splimp is an ipl high enough to block all imps.
- * While manipulating the mbuf buffer pool you have to block imps.
- */
-
-/* splnet is defined in ../sys/asm.sed */
-#define        splimp          spl6    /* temporary hack, usually spl5 */
-#define        setsoftnet()    mtpr(SIRR, 12)
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define        NETISR_RAW      0               /* same as AF_UNSPEC */
-#define        NETISR_IP       2               /* same as AF_INET */
-#define        NETISR_NS       6               /* same as AF_NS */
-
-#define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }
-

 #ifndef LOCORE
 #ifdef KERNEL
 #ifndef LOCORE
 #ifdef KERNEL

-int    netisr;                         /* scheduling bits for network */
-#endif
-
-
-#ifdef KERNEL

 n_time iptime();
 #endif
 n_time iptime();
 #endif

-
-#ifdef KPROF
-#include "../inet/count.h"
-#define        COUNT(i)        nrcount[i]++
-int    nrcount[NCOUNTERS+1];
-#else
-#define        COUNT(i)
-#endif

 #endif
 #endif