[PATCH 1/7] netpoll: shorten carrier detect timeout

[Matt Mackall <mpm@xxxxxxxxxxx>]

Shorten carrier detect timeout to 4 seconds.

Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>

Index: np/net/core/netpoll.c
===================================================================
--- np.orig/net/core/netpoll.c  2005-03-03 14:13:38.700080023 -0600
+++ np/net/core/netpoll.c       2005-03-03 14:16:21.980600535 -0600
@@ -593,7 +593,7 @@ int netpoll_setup(struct netpoll *np)
                rtnl_shunlock();
 
                atleast = jiffies + HZ/10;
-               atmost = jiffies + 10*HZ;
+               atmost = jiffies + 4*HZ;
                while (!netif_carrier_ok(ndev)) {
                        if (time_after(jiffies, atmost)) {
                                printk(KERN_NOTICE
@@ -606,7 +606,7 @@ int netpoll_setup(struct netpoll *np)
 
                if (time_before(jiffies, atleast)) {
                        printk(KERN_NOTICE "%s: carrier detect appears flaky,"
-                              " waiting 10 seconds\n",
+                              " waiting 4 seconds\n",
                               np->name);
                        while (time_before(jiffies, atmost))
                                cond_resched();