Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 89ad25a76202924eadf9bce8aadf761dcea3e8d5..d9d1e2bac1d6efc826ed3ef826a91cd06bba78ca 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -475,11 +475,8 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
 {
        struct net_bridge_port *p;
 
-       if (!br_port_exists(dev))
-               return -EINVAL;
-
-       p = br_port_get(dev);
-       if (p->br != br)
+       p = br_port_get_rtnl(dev);
+       if (!p || p->br != br)
                return -EINVAL;
 
        del_nbp(p);