Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[firefly-linux-kernel-4.4.55.git] / net / bridge / br_notify.c

diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 717e1fd6133cbfcd3815e7f13d912597524faa9f..404d4e14c6a7702293521a668914765c3ec59daa 100644 (file)
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -32,14 +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 = dev->br_port;
+       struct net_bridge_port *p = br_port_get(dev);
        struct net_bridge *br;
        int err;
 
        /* not a port of a bridge */
-       if (p == NULL)
+       if (!br_port_exists(dev))
                return NOTIFY_DONE;
 
+       p = br_port_get(dev);
        br = p->br;
 
        switch (event) {