ia64/xen-unstable

changeset 6430:bf16d2ca9cc5
Remove broken patch preventing net device unregister.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author: cl349@firebug.cl.cam.ac.uk
date: Thu Aug 25 15:46:23 2005 +0000 (2005-08-25)
parents: 3b146df7f09e
children: 4f73a7bde7b1
     1.1 --- a/patches/linux-2.6.12/workaround_double_br_del_if.patch	Thu Aug 25 15:45:39 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);