diff options
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_cisco.c | 4 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.c | 9 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.h | 1 | ||||
| -rw-r--r-- | sys/netgraph/ng_ksocket.c | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c index a9780dd..5a7b097 100644 --- a/sys/netgraph/ng_cisco.c +++ b/sys/netgraph/ng_cisco.c @@ -51,16 +51,12 @@ #include <sys/syslog.h> #include <net/if.h> -#include <net/if_var.h> /* XXXGL: ipx? */ #include <netinet/in.h> #include <netinet/if_ether.h> #include <netatalk/at.h> -#include <netipx/ipx.h> -#include <netipx/ipx_if.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 e2d3454..5dc085f 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -43,7 +43,7 @@ /* * This node is also a system networking interface. It has - * a hook for each protocol (IP, AppleTalk, IPX, etc). Packets + * a hook for each protocol (IP, AppleTalk, etc). Packets * are simply relayed between the interface and the hooks. * * Interfaces are named ng0, ng1, etc. New nodes take the @@ -55,7 +55,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> @@ -105,7 +104,6 @@ const static struct iffam gFamilies[] = { { AF_INET, NG_IFACE_HOOK_INET }, { AF_INET6, NG_IFACE_HOOK_INET6 }, { AF_APPLETALK, NG_IFACE_HOOK_ATALK }, - { AF_IPX, NG_IFACE_HOOK_IPX }, { AF_ATM, NG_IFACE_HOOK_ATM }, { AF_NATM, NG_IFACE_HOOK_NATM }, }; @@ -761,11 +759,6 @@ ng_iface_rcvdata(hook_p hook, item_p item) isr = NETISR_IPV6; break; #endif -#ifdef IPX - case AF_IPX: - isr = NETISR_IPX; - break; -#endif #ifdef NETATALK case AF_APPLETALK: isr = NETISR_ATALK2; diff --git a/sys/netgraph/ng_iface.h b/sys/netgraph/ng_iface.h index 58fb442..85123b0 100644 --- a/sys/netgraph/ng_iface.h +++ b/sys/netgraph/ng_iface.h @@ -55,7 +55,6 @@ #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_IPX "ipx" #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 5c0ae67..6f207a9 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -122,7 +122,6 @@ static const struct ng_ksocket_alias ng_ksocket_families[] = { { "inet", PF_INET }, { "inet6", PF_INET6 }, { "atalk", PF_APPLETALK }, - { "ipx", PF_IPX }, { "atm", PF_ATM }, { NULL, -1 }, }; @@ -303,7 +302,6 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type, #if 0 case PF_APPLETALK: /* XXX implement these someday */ case PF_INET6: - case PF_IPX: #endif default: @@ -367,7 +365,6 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type, #if 0 case PF_APPLETALK: /* XXX implement these someday */ case PF_INET6: - case PF_IPX: #endif default: |
