From 3c6b084e9675f9c4f3e9765b9d4b48ff0493d0d1 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Wed, 5 Mar 2003 19:24:24 +0000 Subject: Finish driving a stake through the heart of netns and the associated ifdefs scattered around the place - its dead Jim! The SMB stuff had stolen AF_NS, make it official. --- sys/netgraph/ng_gif_demux.c | 1 - sys/netgraph/ng_gif_demux.h | 1 - sys/netgraph/ng_iface.c | 6 ------ sys/netgraph/ng_iface.h | 1 - 4 files changed, 9 deletions(-) (limited to 'sys/netgraph') diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c index 066bea6e4e29a..4f5fe46105018 100644 --- a/sys/netgraph/ng_gif_demux.c +++ b/sys/netgraph/ng_gif_demux.c @@ -108,7 +108,6 @@ const static struct iffam gFamilies[] = { { AF_IPX, NG_GIF_DEMUX_HOOK_IPX }, { AF_ATM, NG_GIF_DEMUX_HOOK_ATM }, { AF_NATM, NG_GIF_DEMUX_HOOK_NATM }, - { AF_NS, NG_GIF_DEMUX_HOOK_NS }, }; #define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) diff --git a/sys/netgraph/ng_gif_demux.h b/sys/netgraph/ng_gif_demux.h index e2243bb99e519..de03dbc3d0b22 100644 --- a/sys/netgraph/ng_gif_demux.h +++ b/sys/netgraph/ng_gif_demux.h @@ -45,6 +45,5 @@ #define NG_GIF_DEMUX_HOOK_IPX "ipx" #define NG_GIF_DEMUX_HOOK_ATM "atm" #define NG_GIF_DEMUX_HOOK_NATM "natm" -#define NG_GIF_DEMUX_HOOK_NS "ns" #endif /* _NETGRAPH_NG_GIF_DEMUX_H_ */ diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index efaee7fa95145..55cc7ac1ff8b1 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -97,7 +97,6 @@ const static struct iffam gFamilies[] = { { AF_IPX, NG_IFACE_HOOK_IPX }, { AF_ATM, NG_IFACE_HOOK_ATM }, { AF_NATM, NG_IFACE_HOOK_NATM }, - { AF_NS, NG_IFACE_HOOK_NS }, }; #define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) @@ -770,11 +769,6 @@ ng_iface_rcvdata(hook_p hook, item_p item) isr = NETISR_IPX; break; #endif -#ifdef NS - case AF_NS: - isr = NETISR_NS; - 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 3c714c9f32832..00dfd387aa4b1 100644 --- a/sys/netgraph/ng_iface.h +++ b/sys/netgraph/ng_iface.h @@ -58,7 +58,6 @@ #define NG_IFACE_HOOK_IPX "ipx" #define NG_IFACE_HOOK_ATM "atm" #define NG_IFACE_HOOK_NATM "natm" -#define NG_IFACE_HOOK_NS "ns" /* MTU bounds */ #define NG_IFACE_MTU_MIN 72 -- cgit v1.3