From d15f4a9e26b12954e4cb41837878b2976b504eec Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sat, 29 Jan 2000 16:56:24 +0000
Subject: Remove some #if NFOO > 0 that are always true because of config
 rules.

---
 sys/net/if_loop.c   | 2 --
 sys/net/if_ppp.c    | 3 ---
 sys/net/if_pppvar.h | 2 +-
 sys/net/if_sl.c     | 5 +----
 sys/net/if_vlan.c   | 3 ---
 sys/net/ppp_tty.c   | 5 -----
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a714bf1..a4f37cd 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -38,7 +38,6 @@
  * Loopback interface driver for protocol testing and timing.
  */
 #include "loop.h"
-#if NLOOP > 0
 
 #include "opt_atalk.h"
 #include "opt_inet.h"
@@ -398,4 +397,3 @@ loioctl(ifp, cmd, data)
 	}
 	return (error);
 }
-#endif /* NLOOP > 0 */
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 1db8237..9abb893 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -74,7 +74,6 @@
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
 #include "ppp.h"
-#if NPPP > 0
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
@@ -1572,5 +1571,3 @@ done:
     *bp = 0;
     printf("%s\n", buf);
 }
-
-#endif	/* NPPP > 0 */
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index e4b4fd7..77456f7 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -98,7 +98,7 @@ struct ppp_softc {
 	int	sc_rawin_count;		/* # in sc_rawin */
 };
 
-extern struct ppp_softc ppp_softc[NPPP];
+extern struct ppp_softc ppp_softc[];
 
 struct	ppp_softc *pppalloc __P((pid_t pid));
 void	pppdealloc __P((struct ppp_softc *sc));
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 456f827..cc37adb 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -66,10 +66,9 @@
  */
 
 #include "sl.h"
-#if NSL > 0
 
 #include "opt_inet.h"
-#if !defined(ACTUALLY_LKM_NOT_KERNEL) && !defined(KLD_MODULE)
+#if !defined(KLD_MODULE)
 #include "opt_slip.h"
 #endif
 #include <sys/param.h>
@@ -1036,5 +1035,3 @@ sl_outfill(chan)
 		sc->sc_flags &= ~SC_OUTWAIT;
 	}
 }
-
-#endif
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 218bff7..bb92b97 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -55,7 +55,6 @@
  */
 
 #include "vlan.h"
-#if NVLAN > 0
 #include "opt_inet.h"
 
 #include <sys/param.h>
@@ -553,5 +552,3 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	}
 	return error;
 }
-
-#endif /* NVLAN > 0 */
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index cb181c5..2c4a1cf 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -72,9 +72,6 @@
 
 /* $FreeBSD$ */
 
-#include "ppp.h"
-#if NPPP > 0
-
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
 #define VJC			/* XXX for ppp_defs.h */
@@ -1124,5 +1121,3 @@ ppplogchar(sc, c)
 	sc->sc_rawin_count = 0;
     }
 }
-
-#endif	/* NPPP > 0 */
-- 
cgit v1.1