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_notify.c

diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 404d4e14c6a7702293521a668914765c3ec59daa..7d337c9b6082a5f3d23efa47823db5b2d99f7e5a 100644 (file)
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -32,15 +32,15 @@ struct notifier_block br_device_notifier = {
 static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr)
 {
        struct net_device *dev = ptr;
-       struct net_bridge_port *p = br_port_get(dev);
+       struct net_bridge_port *p;
        struct net_bridge *br;
        int err;
 
        /* not a port of a bridge */
-       if (!br_port_exists(dev))
+       p = br_port_get_rtnl(dev);
+       if (!p)
                return NOTIFY_DONE;
 
-       p = br_port_get(dev);
        br = p->br;
 
        switch (event) {