Author: jhb
Date: Mon May 17 19:51:34 2010
New Revision: 208213
URL: http://svn.freebsd.org/changeset/base/208213
Log:
Prevent unloading a kld for a driver that has subinterfaces (vlan and/or
wlan interfaces) from being automatically reloaded via devd shutdown
event handlers.
- Revert part of my previous changes to call ifn_stop on subinterfaces
when an interface is detached. It is better to destroy the interfaces
first so that an 'ifconfig foo0.blah down' doesn't result in ifconfig
auto-loading if_foo.ko. The ifconfig command will not be invoked if
foo0.blah is gone when ifn_stop() is called. Furthermore, it is not
necessary to explicitly invoke ifn_stop() after the subinterface is
destroyed as devd will already do that.
- Pass -n to ifconfig when destroying interfaces so that destroying a
cloned interface does not kldload any drivers.
Reviewed by: dougb
MFC after: 4 days
Modified:
head/etc/network.subr
Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr Mon May 17 19:36:56 2010 (r208212)
+++ head/etc/network.subr Mon May 17 19:51:34 2010 (r208213)
@@ -917,7 +917,7 @@ clone_down()
_list=
for ifn in ${cloned_interfaces}; do
- ifconfig ${ifn} destroy
+ ifconfig -n ${ifn} destroy
if [ $? -eq 0 ]; then
_list="${_list}${_prefix}${ifn}"
[ -z "$_prefix" ] && _prefix=' '
@@ -1002,10 +1002,7 @@ childif_destroy()
if ! ifexists $child; then
continue
fi
- if autoif $child; then
- ifn_stop $child
- fi
- ifconfig $child destroy && cfg=0
+ ifconfig -n $child destroy && cfg=0
done
child_vlans=`get_if_var $ifn vlans_IF`
@@ -1016,10 +1013,7 @@ childif_destroy()
if ! ifexists $child; then
continue
fi
- if autoif $child; then
- ifn_stop $child
- fi
- ifconfig $child destroy && cfg=0
+ ifconfig -n $child destroy && cfg=0
done
return ${cfg}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
