summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2014-03-14 06:29:43 +0000
committerglebius <glebius@FreeBSD.org>2014-03-14 06:29:43 +0000
commit80e85e32a582ff3a03a87cb98dd996b7929f824b (patch)
treeb6714370b79bb13837321dcbc195eadc7047b2b2 /sys/netgraph
parentfc1b773c21c561cbe8c09b09d48f80aada9bc2f9 (diff)
downloadFreeBSD-src-80e85e32a582ff3a03a87cb98dd996b7929f824b.zip
FreeBSD-src-80e85e32a582ff3a03a87cb98dd996b7929f824b.tar.gz
Remove AppleTalk support.
AppleTalk was a network transport protocol for Apple Macintosh devices in 80s and then 90s. Starting with Mac OS X in 2000 the AppleTalk was a legacy protocol and primary networking protocol is TCP/IP. The last Mac OS X release to support AppleTalk happened in 2009. The same year routing equipment vendors (namely Cisco) end their support. Thus, AppleTalk won't be supported in FreeBSD 11.0-RELEASE.
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/ng_cisco.c2
-rw-r--r--sys/netgraph/ng_iface.c7
-rw-r--r--sys/netgraph/ng_iface.h1
-rw-r--r--sys/netgraph/ng_ksocket.c10
4 files changed, 2 insertions, 18 deletions
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 5a7b097..61c3b7f 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -55,8 +55,6 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/ng_parse.h>
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 5dc085f..b44dcdd 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -52,7 +52,6 @@
* This node also includes Berkeley packet filter support.
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -103,7 +102,6 @@ typedef const struct iffam *iffam_p;
const static struct iffam gFamilies[] = {
{ AF_INET, NG_IFACE_HOOK_INET },
{ AF_INET6, NG_IFACE_HOOK_INET6 },
- { AF_APPLETALK, NG_IFACE_HOOK_ATALK },
{ AF_ATM, NG_IFACE_HOOK_ATM },
{ AF_NATM, NG_IFACE_HOOK_NATM },
};
@@ -759,11 +757,6 @@ ng_iface_rcvdata(hook_p hook, item_p item)
isr = NETISR_IPV6;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- isr = NETISR_ATALK2;
- break;
-#endif
default:
m_freem(m);
return (EAFNOSUPPORT);
diff --git a/sys/netgraph/ng_iface.h b/sys/netgraph/ng_iface.h
index 85123b0..3497e9d 100644
--- a/sys/netgraph/ng_iface.h
+++ b/sys/netgraph/ng_iface.h
@@ -54,7 +54,6 @@
/* My hook names */
#define NG_IFACE_HOOK_INET "inet"
#define NG_IFACE_HOOK_INET6 "inet6"
-#define NG_IFACE_HOOK_ATALK "atalk" /* AppleTalk phase 2 */
#define NG_IFACE_HOOK_ATM "atm"
#define NG_IFACE_HOOK_NATM "natm"
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index 6f207a9..0797842 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -67,7 +67,6 @@
#include <netinet/in.h>
#include <netinet/ip.h>
-#include <netatalk/at.h>
#ifdef NG_SEPARATE_MALLOC
static MALLOC_DEFINE(M_NETGRAPH_KSOCKET, "netgraph_ksock",
@@ -121,7 +120,6 @@ static const struct ng_ksocket_alias ng_ksocket_families[] = {
{ "local", PF_LOCAL },
{ "inet", PF_INET },
{ "inet6", PF_INET6 },
- { "atalk", PF_APPLETALK },
{ "atm", PF_ATM },
{ NULL, -1 },
};
@@ -151,8 +149,6 @@ static const struct ng_ksocket_alias ng_ksocket_protos[] = {
{ "encap", IPPROTO_ENCAP, PF_INET },
{ "divert", IPPROTO_DIVERT, PF_INET },
{ "pim", IPPROTO_PIM, PF_INET },
- { "ddp", ATPROTO_DDP, PF_APPLETALK },
- { "aarp", ATPROTO_AARP, PF_APPLETALK },
{ NULL, -1 },
};
@@ -300,8 +296,7 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type,
}
#if 0
- case PF_APPLETALK: /* XXX implement these someday */
- case PF_INET6:
+ case PF_INET6: /* XXX implement this someday */
#endif
default:
@@ -363,8 +358,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type,
}
#if 0
- case PF_APPLETALK: /* XXX implement these someday */
- case PF_INET6:
+ case PF_INET6: /* XXX implement this someday */
#endif
default:
OpenPOWER on IntegriCloud