Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[karo-tx-linux.git] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index a7b3421318696e0e8dc596f19658774810f44a59..357bd4ee4baa324f1402ae3d7a44c37ce4d1e46e 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -126,7 +126,7 @@ static void linkwatch_schedule_work(int urgent)
                return;
 
        /* It's already running which is good enough. */
-       if (!cancel_delayed_work(&linkwatch_work))
+       if (!__cancel_delayed_work(&linkwatch_work))
                return;
 
        /* Otherwise we reschedule it again for immediate execution. */