ia64/xen-unstable

changeset 6413:d61f8afd292c

1. Remove workaround patch
2. Update scripts/vif-bridge to not call 'brctl delif'

When a domU is shutdown/destroyed and the netif is destroyed, the
notify_call_chain triggered from unregister_netdevice() will trigger the
bridge event handler and which will call the proper code to remove the
device from the bridge.

I can't see any reason why brtcl delif should be called when taking out
a domain if the call chain will delete the interface from the bridge
when the vif is destroyed automatically.

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Aug 25 15:51:30 2005 +0000 (2005-08-25)
parents 37030498b978
children 85ccfd035658
files tools/examples/vif-bridge
line diff
     1.1 --- a/patches/linux-2.6.12/workaround_double_br_del_if.patch	Thu Aug 25 14:58:20 2005 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,11 +0,0 @@
     1.4 ---- linux-2.6.12/net/bridge/br_if.c	2005-06-17 14:48:29.000000000 -0500
     1.5 -+++ linux-2.6.12-xen0-smp/net/bridge/br_if.c	2005-08-18 15:17:27.302615846 -0500
     1.6 -@@ -382,7 +382,7 @@
     1.7 - {
     1.8 - 	struct net_bridge_port *p = dev->br_port;
     1.9 - 	
    1.10 --	if (!p || p->br != br) 
    1.11 -+	if (!p || p->br != br || p->state == BR_STATE_DISABLED)
    1.12 - 		return -EINVAL;
    1.13 - 
    1.14 - 	br_sysfs_removeif(p);
     2.1 --- a/tools/examples/vif-bridge	Thu Aug 25 14:58:20 2005 +0000
     2.2 +++ b/tools/examples/vif-bridge	Thu Aug 25 15:51:30 2005 +0000
     2.3 @@ -74,8 +74,10 @@ if [ "${bridge}" == "null" ] ; then
     2.4      exit
     2.5  fi
     2.6  
     2.7 -# Add/remove vif to/from bridge.
     2.8 -brctl ${brcmd} ${bridge} ${vif}
     2.9 +# Add vif to bridge. vifs are auto-removed from bridge.
    2.10 +if [ "${brcmd}" == "addif" ] ; then
    2.11 +    brctl ${brcmd} ${bridge} ${vif}
    2.12 +fi
    2.13  ifconfig ${vif} $OP
    2.14  
    2.15  if [ ${ip} ] ; then