3 files changed, 5 insertions, 158 deletions

diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index fcca3fa7914f..b1e7011362a8 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -3,6 +3,6 @@
 
 KMOD=		ng_iface
 SRCS= 		ng_iface.c
-MAN8=		ng_iface.8
+MAN4=		ng_iface.4
 
 .include "${.CURDIR}/../../../conf/kmod.mk"
diff --git a/sys/modules/netgraph/iface/ng_iface.4 b/sys/modules/netgraph/iface/ng_iface.4
index d56ead9d1e85..c2a8becbd41f 100644
--- a/sys/modules/netgraph/iface/ng_iface.4
+++ b/sys/modules/netgraph/iface/ng_iface.4
@@ -36,7 +36,7 @@
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
-.Dt NG_IFACE 8
+.Dt NG_IFACE 4
 .Os FreeBSD
 .Sh NAME
 .Nm ng_iface
@@ -118,9 +118,9 @@ Set the interface to broadcast mode.
 The interface must not currently be up.
 .It Dv NGM_CISCO_GET_IPADDR
 This message is defined by the
-.Xr ng_cisco 8
+.Xr ng_cisco 4
 node type; see
-.Xr ng_cisco 8
+.Xr ng_cisco 4
 for a description.
 .El
 .Sh SHUTDOWN
@@ -141,8 +141,8 @@ control message is required.
 .Sh SEE ALSO
 .Xr bpf 4 ,
 .Xr netgraph 4 ,
+.Xr ng_cisco 4 ,
 .Xr ifconfig 8 ,
-.Xr ng_cisco 8 ,
 .Xr ngctl 8
 .Sh HISTORY
 The
diff --git a/sys/modules/netgraph/iface/ng_iface.8 b/sys/modules/netgraph/iface/ng_iface.8
deleted file mode 100644
index d56ead9d1e85..000000000000
--- a/sys/modules/netgraph/iface/ng_iface.8
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" Copyright (c) 1996-1999 Whistle Communications, Inc.
-.\" All rights reserved.
-.\" 
-.\" Subject to the following obligations and disclaimer of warranty, use and
-.\" redistribution of this software, in source or object code forms, with or
-.\" without modifications are expressly permitted by Whistle Communications;
-.\" provided, however, that:
-.\" 1. Any and all reproductions of the source or object code must include the
-.\"    copyright notice above and the following disclaimer of warranties; and
-.\" 2. No rights are granted, in any manner or form, to use Whistle
-.\"    Communications, Inc. trademarks, including the mark "WHISTLE
-.\"    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
-.\"    such appears in the above copyright notice or in the software.
-.\" 
-.\" THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
-.\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
-.\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
-.\" INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-.\" WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
-.\" REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
-.\" SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
-.\" IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
-.\" RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
-.\" WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-.\" PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
-.\" OF SUCH DAMAGE.
-.\" 
-.\" Author: Archie Cobbs <archie@whistle.com>
-.\"
-.\" $FreeBSD$
-.\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
-.\"
-.Dd January 19, 1999
-.Dt NG_IFACE 8
-.Os FreeBSD
-.Sh NAME
-.Nm ng_iface
-.Nd interface netgraph node type
-.Sh SYNOPSIS
-.Fd #include <netgraph/ng_iface.h>
-.Sh DESCRIPTION
-An
-.Nm iface
-node is both a netgraph node and a system networking interface.  When an
-.Nm iface
-node is created, a new interface appears which is accessible via
-.Xr ifconfig 8 .
-.Nm Iface
-node interfaces are named
-.Dv ng0 ,
-.Dv ng1 ,
-etc.
-When a node is shutdown, the corresponding interface is removed
-and the interface name becomes available for reuse by future
-.Nm iface
-nodes; new nodes always take the first unused interface.
-The node itself is assigned the same name as its interface, unless the name
-already exists, in which case the node remains unnamed.
-.Pp
-An
-.Nm iface
-node has a single hook corresponding to each supported protocol.
-Packets transmitted via the interface flow out the corresponding
-protocol-specific hook.
-Similarly, packets received on a hook appear on the interface as 
-packets received into the corresponding protocol stack.
-The currently supported protocols are IP, IPv6, AppleTalk, IPX, ATM,
-NATM, and NS.
-.Pp
-An
-.Nm iface
-node be configured as a point-to-point interface or a broadcast interface.
-The configuration can only be changed when the interface is down.
-The default mode is point-to-point.
-.Pp
-.Nm Iface
-nodes support the Berkeley Packet Filter (BPF). 
-.Sh HOOKS
-This node type supports the following hooks:
-.Pp
-.Bl -tag -width foobar
-.It Dv inet
-Transmission and reception of IP packets.
-.It Dv inet6
-Transmission and reception of IPv6 packets.
-.It Dv atalk
-Transmission and reception of AppleTalk packets.
-.It Dv ipx
-Transmission and reception of IPX packets.
-.It Dv atm
-Transmission and reception of ATM packets.
-.It Dv natm
-Transmission and reception of NATM packets.
-.It Dv ns
-Transmission and reception of NS packets.
-.El
-.Sh CONTROL MESSAGES
-This node type supports the generic control messages, plus the following:
-.Bl -tag -width foo
-.It Dv NGM_IFACE_GET_IFNAME
-Returns the name of the interface corresponding to this node in a
-.Dv "struct ng_iface_ifname" :
-.Bd -literal -offset 4n
-struct ng_iface_ifname {
-  char  ngif_name[NG_IFACE_IFACE_NAME_MAX + 1];
-};
-.Ed
-.It Dv NGM_IFACE_POINT2POINT
-Set the interface to point-to-point mode.
-The interface must not currently be up.
-.It Dv NGM_IFACE_BROADCAST
-Set the interface to broadcast mode.
-The interface must not currently be up.
-.It Dv NGM_CISCO_GET_IPADDR
-This message is defined by the
-.Xr ng_cisco 8
-node type; see
-.Xr ng_cisco 8
-for a description.
-.El
-.Sh SHUTDOWN
-This node shuts down upon receipt of a
-.Dv NGM_SHUTDOWN
-control message.  The associated interface is removed and becomes available
-for use by future
-.Nm iface
-nodes.
-.Pp
-Unlike most other node types, an
-.Nm iface
-node does
-.Em not
-go away when all hooks have been disconnected; rather, and explicit
-.Dv NGM_SHUTDOWN
-control message is required.
-.Sh SEE ALSO
-.Xr bpf 4 ,
-.Xr netgraph 4 ,
-.Xr ifconfig 8 ,
-.Xr ng_cisco 8 ,
-.Xr ngctl 8
-.Sh HISTORY
-The
-.Nm iface
-node type was implemented in
-.Fx 4.0 .
-.Sh AUTHOR
-.An Archie Cobbs Aq archie@whistle.com