Merge tag 'staging-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 8f82a5c..9c3a839 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -92,6 +92,9 @@ static bool linkwatch_urgent_event(struct net_device *dev)
        if (dev->ifindex != dev->iflink)
                return true;
 
+       if (dev->priv_flags & IFF_TEAM_PORT)
+               return true;
+
        return netif_carrier_ok(dev) && qdisc_tx_changing(dev);
 }