- Nuke some more not needed #ifdef cruft.

5 files changed, 0 insertions, 72 deletions

diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 2d028fd..b811131 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -175,11 +175,7 @@ ipatm_nifstat(cmd, nip, arg)
 		/*
 		 * We only care about IP addresses
 		 */
-#if (defined(BSD) && (BSD >= 199103))
 		if (((struct ifaddr *)arg)->ifa_addr->sa_family != AF_INET)
-#else
-		if (((struct ifaddr *)arg)->ifa_addr.sa_family != AF_INET)
-#endif
 			break;
 
 		/*
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 30f6326..8e44bdb 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -127,9 +127,6 @@ ipatm_ipinput(inp, m)
 	struct ip_nif	*inp;
 	KBuffer		*m;
 {
-#if	BSD < 199103
-	int		space;
-#endif
 
 #ifdef DIAGNOSTIC
 	if (ipatm_print) {
@@ -137,9 +134,6 @@ ipatm_ipinput(inp, m)
 	}
 #endif
 
-#if defined(BSD)
-#if BSD >= 199103
-
 #ifdef DIAGNOSTIC
 	if (!KB_ISPKT(m)) {
 		panic("ipatm_ipinput: no packet header");
@@ -162,43 +156,6 @@ ipatm_ipinput(inp, m)
 	 */
 	m->m_pkthdr.rcvif = (struct ifnet *)inp->inf_nif;
 
-#else	/* ! BSD >= 199103 */
-	/*
-	 * Stick ifnet pointer onto front of packet - hopefully 
-	 * there'll be room in the first buffer.
-	 */
-	KB_HEADROOM(m, space);
-	if (space < sizeof(struct ifnet *)) {
-		KBuffer		*n;
-
-		/*
-		 * We have to allocate another buffer and tack it
-		 * onto the front of the packet
-		 */
-		KB_ALLOCPKT(n, sizeof(struct ifnet *),
-			KB_F_NOWAIT, KB_T_HEADER);
-		if (n == 0) {
-			KB_FREEALL(m);
-			ipatm_stat.ias_rcvnobuf++;
-			return (1);
-		}
-		KB_LEN(n) = sizeof(struct ifnet *);
-		KB_LINKHEAD(n, m);
-		m = n;
-	} else {
-		/*
-		 * Header fits, just adjust buffer controls
-		 */
-		KB_HEADADJ(m, sizeof(struct ifnet *));
-	}
-	{
-		struct ifnet	**p;
-
-		KB_DATASTART(m, p, struct ifnet **);
-		*p = (struct ifnet *)inp->inf_nif;
-	}
-#endif	/* ! BSD >= 199103 */
-
 	/*
 	 * Finally, hand packet off to IP.
 	 *
@@ -208,13 +165,7 @@ ipatm_ipinput(inp, m)
 	 */
 	if (! IF_HANDOFF(&ipintrq, m, NULL))
 		return (1);
-#if	BSD < 199506
-	ipintr();
-#else
 	schednetisr ( NETISR_IP );
-#endif	/* BSD >= 199506 */
-#endif	/* defined(BSD) */
-
 	return (0);
 }
 
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 431f9ff..be89be8 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -138,9 +138,6 @@ ipatm_ifoutput(ifp, m, dst)
 		}
 	} else {
 		struct in_ifaddr	*ia;
-#if (defined(BSD) && (BSD < 199306))
-		extern struct ifnet	loif;
-#endif
 
 		/*
 		 * No VCC to destination
@@ -166,11 +163,7 @@ ipatm_ifoutput(ifp, m, dst)
 		/*
 		 * Is this a broadcast packet ??
 		 */
-#if (defined(BSD) && (BSD >= 199306))
 		if (in_broadcast(((struct sockaddr_in *)dst)->sin_addr, ifp)) {
-#else
-		if (in_broadcast(((struct sockaddr_in *)dst)->sin_addr)) {
-#endif
 			struct ip_nif	*inp;
 			int	s;
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index fbcab85..4860594 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -230,11 +230,7 @@ ipatm_ioctl(code, data, arg1)
 		}
 
 		if ((ip.s_addr == INADDR_ANY) ||
-#if (defined(BSD) && (BSD >= 199306))   
 		    in_broadcast(ip, &inp->inf_nif->nif_if) ||
-#else
-		    in_broadcast(ip) ||
-#endif
 		    IN_MULTICAST(ntohl(ip.s_addr))) {
 			err = EADDRNOTAVAIL;
 			break;
@@ -293,11 +289,7 @@ ipatm_ioctl(code, data, arg1)
 		}
 
 		if ((ip.s_addr == INADDR_ANY) ||
-#if (defined(BSD) && (BSD >= 199306))   
 		    in_broadcast(ip, &inp->inf_nif->nif_if) ||
-#else
-		    in_broadcast(ip) ||
-#endif
 		    IN_MULTICAST(ntohl(ip.s_addr))) {
 			err = EADDRNOTAVAIL;
 			break;
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index aceb804..33605e1 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -371,11 +371,7 @@ ipatm_openpvc(pvp, sivp)
 	 * Validate fixed destination IP address
 	 */
 	if (pvp->ipp_dst.sin_addr.s_addr != INADDR_ANY) {
-#if (defined(BSD) && (BSD >= 199306))
 		if (in_broadcast(pvp->ipp_dst.sin_addr, &nip->nif_if) ||
-#else
-		if (in_broadcast(pvp->ipp_dst.sin_addr) ||
-#endif
 		    IN_MULTICAST(ntohl(pvp->ipp_dst.sin_addr.s_addr)) ||
 		    ipatm_chknif(pvp->ipp_dst.sin_addr, inp)) {
 			err = EINVAL;