Merge tag 'fbdev-v4.16' of git://github.com/bzolnier/linux

[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 982861607f883e15f8c81921b72330985349bef9..e38e641e98d5b5c5ec92ed07aa3ce3d2af6f50e3 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -92,7 +92,7 @@ static bool linkwatch_urgent_event(struct net_device *dev)
        if (dev->ifindex != dev_get_iflink(dev))
                return true;
 
-       if (dev->priv_flags & IFF_TEAM_PORT)
+       if (netif_is_lag_port(dev) || netif_is_lag_master(dev))
                return true;
 
        return netif_carrier_ok(dev) && qdisc_tx_changing(dev);