summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-10-28 16:21:31 +0000
committerglebius <glebius@FreeBSD.org>2013-10-28 16:21:31 +0000
commit2d77669bc5393aecbbf1257999de1d3d378714bb (patch)
tree84f021aacf91b0d4791ec36dfe440e0b952ed94b /etc
parentbe5bb9e6118016584f368297c01aa5a97f13828a (diff)
downloadFreeBSD-src-2d77669bc5393aecbbf1257999de1d3d378714bb.zip
FreeBSD-src-2d77669bc5393aecbbf1257999de1d3d378714bb.tar.gz
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
Diffstat (limited to 'etc')
-rw-r--r--etc/defaults/rc.conf4
-rw-r--r--etc/network.subr48
-rwxr-xr-xetc/rc.d/netif3
3 files changed, 0 insertions, 55 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
OpenPOWER on IntegriCloud