Merge tag 'powerpc-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-block.git] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index e38e641e98d5b5c5ec92ed07aa3ce3d2af6f50e3..7f51efb2b3ab9715cff64f61072e1b9b242a3a5b 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -155,7 +155,7 @@ static void linkwatch_do_dev(struct net_device *dev)
        clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state);
 
        rfc2863_policy(dev);
-       if (dev->flags & IFF_UP) {
+       if (dev->flags & IFF_UP && netif_device_present(dev)) {
                if (netif_carrier_ok(dev))
                        dev_activate(dev);
                else