Remove more remnants of ng_fec(4).

The ng_create_one() and ng_mkpeer() functions in network.subr are
now not used anywhere, but I left them, since they can be useful
in future in netgraph scripting.

Submitted by:	pluknet

6 files changed, 1 insertions, 85 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 471fb3c..59bc8f6 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -235,10 +235,6 @@ gif_interfaces=""		# List of GIF tunnels.
 				# Choose correct tunnel addrs.
 #gifconfig_gif0="10.1.1.1 10.1.2.1"	# Examples typically for a router.
 #gifconfig_gif1="10.1.1.2 10.1.2.2"	# Examples typically for a router.
-fec_interfaces=""		# List of Fast EtherChannels.
-#fec_interfaces="fec0 fec1"
-#fecconfig_fec0="fxp0 dc0"	# Examples typically for two NICs
-#fecconfig_fec1="em0 em1 bge0 bge1"	# Examples typically for four NICs
 
 # User ppp configuration.
 ppp_enable="NO"		# Start user-ppp (or NO).
diff --git a/etc/network.subr b/etc/network.subr
index f92cab1..de9d997 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1520,54 +1520,6 @@ ng_create_one()
 	done
 }
 
-# ng_fec_create ifn
-#	Configure Fast EtherChannel for interface $ifn. Returns 0 if
-#	FEC arguments were found and configured; returns !0 otherwise.
-ng_fec_create()
-{
-	 local req_iface iface bogus
-	 req_iface="$1"
-
-	 ngctl shutdown ${req_iface}: > /dev/null 2>&1
-
-	 bogus=""
-	 while true; do
-		 iface=`ng_create_one fec dummy fec`
-		 if [ -z "${iface}" ]; then
-			 exit 2
-		 fi
-		 if [ "${iface}" = "${req_iface}" ]; then
-			 break
-		 fi
-		 bogus="${bogus} ${iface}"
-	 done
-
-	 for iface in ${bogus}; do
-		 ngctl shutdown ${iface}:
-	 done
-}
-
-# fec_up
-#	Create Fast EtherChannel interfaces.
-fec_up()
-{
-	local i j
-
-	for i in ${fec_interfaces}; do
-		ng_fec_create $i
-		for j in `get_if_var $i fecconfig_IF`; do
-			case ${j} in
-			'')
-				continue
-				;;
-			*)
-				ngctl msg ${i}: add_iface "\"${j}\""
-				;;
-			esac
-		done
-	done
-}
-
 # ipx_up ifn
 #	Configure any IPX addresses for interface $ifn. Returns 0 if
 #	IPX arguments were found and configured; returns 1 otherwise.
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index daece80..154f1ce 100755
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -62,9 +62,6 @@ network_start()
 
 		# disable SIGINT (Ctrl-c) when running at startup
 		trap : 2
-
-		# Create Fast EtherChannel interfaces
-		fec_up
 	fi
 
 	# Create cloned interfaces
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index aec7b7e..bb2cfc6 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -175,7 +175,6 @@ device will be used:
 (Note the mac address of the wireless device is forced to match the wired
 device as a workaround.)
 .Sh SEE ALSO
-.Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
 .Xr sysctl 8 ,
 .Xr ifconfig 8
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 2a0f3ba..4e1f2b6 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 19, 2013
+.Dd October 28, 2013
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1676,33 +1676,6 @@ Even if this variable is specified to
 .Dq YES ,
 .Dq :nosticky
 keyword can be used to override it on per interface basis.
-.It Va fec_interfaces
-.Pq Vt str
-Set to the list of
-.Xr ng_fec 4
-Fast EtherChannel interfaces to configure on this host.
-A
-.Va fecconfig_ Ns Aq Ar interface
-variable is assumed to exist for each value of
-.Ar interface .
-The value of this variable is used to configure link aggregated interfaces
-according to the syntax of the
-.Cm NGM_FEC_ADD_IFACE
-to
-.Xr ngctl 8
-msg.
-Additionally, this option ensures that each listed interface is created
-via the
-.Cm mkpeer
-command to
-.Xr ngctl 8
-before attempting to configure it.
-For example:
-.Bd -literal
-fec_interfaces="fec0"
-fecconfig_fec0="em0 em1"
-ifconfig_fec0="DHCP"
-.Ed
 .It Va gif_interfaces
 .Pq Vt str
 This variable is deprecated in favor of
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 0757b5f..6398ea2 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -375,7 +375,6 @@ ng_echo_load="NO"		# Netgraph echo node type
 ng_eiface_load="NO"		# generic Ethernet interface netgraph node type
 ng_etf_load="NO"		# Ethertype filtering netgraph node type
 ng_ether_load="NO"		# Ethernet netgraph node type
-ng_fec_load="NO"		# netgraph Fast EtherChannel node
 ng_frame_relay_load="NO"	# frame relay netgraph node type
 ng_gif_load="NO"		# generic tunnel interface netgraph node type
 ng_gif_demux_load="NO"		# demultiplexer for packets from ng_gif(4) nodes