Merge remote-tracking branch 'regulator/fix/doc' into tmp

[~andy/linux] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 8e397a69005afd51726a2310e735416b31d665d3..8f82a5cc3851d3a61953a6cad926c9040bc770a7 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -76,6 +76,14 @@ static void rfc2863_policy(struct net_device *dev)
 }
 
 
+void linkwatch_init_dev(struct net_device *dev)
+{
+       /* Handle pre-registration link state changes */
+       if (!netif_carrier_ok(dev) || netif_dormant(dev))
+               rfc2863_policy(dev);
+}
+
+
 static bool linkwatch_urgent_event(struct net_device *dev)
 {
        if (!netif_running(dev))