begone, fucking rotten appletalk shit. ok room

6 files changed, 5 insertions, 161 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index e84e4023fe6..f8969a2cb02 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.238 2011/07/08 18:48:51 henning Exp $	*/
+/*	$OpenBSD: if.c,v 1.239 2011/07/09 00:47:18 henning Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -585,10 +585,6 @@ do { \
 #ifdef INET6
 	IF_DETACH_QUEUES(ip6intrq);
 #endif
-#ifdef NETATALK
-	IF_DETACH_QUEUES(atintrq1);
-	IF_DETACH_QUEUES(atintrq2);
-#endif
 #ifdef NATM
 	IF_DETACH_QUEUES(natmintrq);
 #endif
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 0321a33726f..477fd7018b5 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.150 2011/07/08 18:30:16 yasuoka Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.151 2011/07/09 00:47:18 henning Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -151,15 +151,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <net/pipex.h>
 #endif
 
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-extern u_char	at_org_code[ 3 ];
-extern u_char	aarp_org_code[ 3 ];
-#endif /* NETATALK */
-
 #ifdef MPLS
 #include <netmpls/mpls.h>
 #endif /* MPLS */
@@ -172,19 +163,11 @@ u_char etherbroadcastaddr[ETHER_ADDR_LEN] =
 int
 ether_ioctl(struct ifnet *ifp, struct arpcom *arp, u_long cmd, caddr_t data)
 {
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int error = 0;
 
 	switch (cmd) {
 	case SIOCSIFADDR:
-		switch (ifa->ifa_addr->sa_family) {
-#ifdef NETATALK
-		case AF_APPLETALK:
-			/* Nothing to do. */
-			break;
-#endif /* NETATALK */
-		}
 		break;
 
 	case SIOCSIFMTU:
@@ -316,56 +299,6 @@ ether_output(ifp0, m0, dst, rt0)
 		etype = htons(ETHERTYPE_IPV6);
 		break;
 #endif
-#ifdef NETATALK
-	case AF_APPLETALK: {
-		struct at_ifaddr *aa;
-
-		if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) {
-#ifdef NETATALKDEBUG
-			extern char *prsockaddr(struct sockaddr *);
-			printf("aarpresolv: failed for %s\n", prsockaddr(dst));
-#endif /* NETATALKDEBUG */
-			return (0);
-		}
-
-		/*
-		 * ifaddr is the first thing in at_ifaddr
-		 */
-		aa = (struct at_ifaddr *)at_ifawithnet(
-			(struct sockaddr_at *)dst,
-			TAILQ_FIRST(&ifp->if_addrlist));
-		if (aa == 0)
-			goto bad;
-
-		/*
-		 * In the phase 2 case, we need to prepend an mbuf for the llc
-		 * header. Since we must preserve the value of m, which is
-		 * passed to us by value, we m_copy() the first mbuf,
-		 * and use it for our llc header.
-		 */
-		if (aa->aa_flags & AFA_PHASE2) {
-			struct llc llc;
-
-			M_PREPEND(m, AT_LLC_SIZE, M_DONTWAIT);
-			if (m == NULL)
-				return (0);
-			/*
-			 * FreeBSD doesn't count the LLC len in
-			 * ifp->obytes, so they increment a length
-			 * field here. We don't do this.
-			 */
-			llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
-			llc.llc_control = LLC_UI;
-			bcopy(at_org_code, llc.llc_snap.org_code,
-				sizeof(at_org_code));
-			llc.llc_snap.ether_type = htons( ETHERTYPE_AT );
-			bcopy(&llc, mtod(m, caddr_t), AT_LLC_SIZE);
-			etype = htons(m->m_pkthdr.len);
-		} else {
-			etype = htons(ETHERTYPE_AT);
-		}
-		} break;
-#endif /* NETATALK */
 #ifdef MPLS
        case AF_MPLS:
 		if (rt)
@@ -723,17 +656,6 @@ decapsulate:
 		inq = &ip6intrq;
 		break;
 #endif /* INET6 */
-#ifdef NETATALK
-	case ETHERTYPE_AT:
-		schednetisr(NETISR_ATALK);
-		inq = &atintrq1;
-		break;
-	case ETHERTYPE_AARP:
-		/* probably this should be done with a NETISR as well */
-		/* XXX queue this */
-		aarpinput((struct arpcom *)ifp, m);
-		goto done;
-#endif
 #if NPPPOE > 0 || defined(PIPEX)
 	case ETHERTYPE_PPPOEDISC:
 	case ETHERTYPE_PPPOE:
@@ -786,36 +708,6 @@ decapsulate:
 		l = mtod(m, struct llc *);
 		switch (l->llc_dsap) {
 		case LLC_SNAP_LSAP:
-#ifdef NETATALK
-			/*
-			 * Some protocols (like Appletalk) need special
-			 * handling depending on if they are type II
-			 * or SNAP encapsulated. Everything else
-			 * gets handled by stripping off the SNAP header
-			 * and going back up to decapsulate.
-			 */
-			if (l->llc_control == LLC_UI &&
-			    l->llc_ssap == LLC_SNAP_LSAP &&
-			    Bcmp(&(l->llc_snap.org_code)[0],
-			    at_org_code, sizeof(at_org_code)) == 0 &&
-			    ntohs(l->llc_snap.ether_type) == ETHERTYPE_AT) {
-				inq = &atintrq2;
-				m_adj(m, AT_LLC_SIZE);
-				schednetisr(NETISR_ATALK);
-				break;
-			}
-
-			if (l->llc_control == LLC_UI &&
-			    l->llc_ssap == LLC_SNAP_LSAP &&
-			    Bcmp(&(l->llc_snap.org_code)[0],
-			    aarp_org_code, sizeof(aarp_org_code)) == 0 &&
-			    ntohs(l->llc_snap.ether_type) == ETHERTYPE_AARP) {
-				m_adj(m, AT_LLC_SIZE);
-				/* XXX Really this should use netisr too */
-				aarpinput((struct arpcom *)ifp, m);
-				goto done;
-			}
-#endif /* NETATALK */
 			if (l->llc_control == LLC_UI &&
 			    l->llc_dsap == LLC_SNAP_LSAP &&
 			    l->llc_ssap == LLC_SNAP_LSAP) {
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 4e6d19a9547..998248e4611 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.55 2011/07/04 20:40:58 dhill Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.56 2011/07/09 00:47:18 henning Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -68,12 +68,6 @@
 #error "if_gre used without inet"
 #endif
 
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
@@ -375,11 +369,6 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 			ip_tos = inp->ip_tos;
 			etype = ETHERTYPE_IP;
 			break;
-#ifdef NETATALK
-		case AF_APPLETALK:
-			etype = ETHERTYPE_AT;
-			break;
-#endif
 #ifdef INET6
 		case AF_INET6:
 			etype = ETHERTYPE_IPV6;
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a5063825c43..471c8b8d98f 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.45 2011/07/04 19:24:05 sthen Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.46 2011/07/09 00:47:18 henning Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -138,12 +138,6 @@
 #include <netinet/ip6.h>
 #endif
 
-#ifdef NETATALK
-#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif
-
 #ifdef MPLS
 #include <netmpls/mpls.h>
 #endif
@@ -297,12 +291,6 @@ looutput(ifp, m, dst, rt)
 		isr = NETISR_IPV6;
 		break;
 #endif /* INET6 */
-#ifdef NETATALK
-	case AF_APPLETALK:
-		ifq = &atintrq2;
-		isr = NETISR_ATALK;
-		break;
-#endif /* NETATALK */
 #ifdef MPLS
 	case AF_MPLS:
 		ifq = &mplsintrq;
@@ -371,12 +359,6 @@ lo_altqstart(ifp)
 			isr = NETISR_MPLS;
 			break;
 #endif
-#ifdef NETATALK
-		case AF_APPLETALK:
-			ifq = &atintrq2;
-			isr = NETISR_ATALK;
-			break;
-#endif /* NETATALK */
 		default:
 			printf("lo_altqstart: can't handle af%d\n", af);
 			m_freem(m);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 6c152ee6514..63a4df98f9c 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.111 2011/07/07 20:42:56 henning Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.112 2011/07/09 00:47:18 henning Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -75,11 +75,6 @@
 #include <net/pipex.h>
 #endif
 
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif
-
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -948,12 +943,6 @@ tunwrite(dev_t dev, struct uio *uio, int ioflag)
 		isr = NETISR_IPV6;
 		break;
 #endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-		ifq = &atintrq2;
-		isr = NETISR_ATALK;
-		break;
-#endif
 	default:
 		m_freem(top);
 		return (EAFNOSUPPORT);
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index cebb285409f..aa3bd1ff61f 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -55,10 +55,6 @@ netintr(void *unused) /* ARGSUSED */
 		if (n & (1 << NETISR_MPLS))
 			mplsintr();
 #endif
-#ifdef NETATALK
-		if (n & (1 << NETISR_ATALK))
-			atintr();
-#endif
 #if NATM > 0
 		if (n & (1 << NETISR_NATM))
 			natmintr();