diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
commit | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch) | |
tree | 9252cd09defdd29742af6b2bd22db72ce252ab1a /net/core/link_watch.c | |
parent | af7a950284af5526a26b4ae4809c1104b4dc47f3 (diff) | |
parent | c5624f554600ab812fe235690665ee81413cebc3 (diff) |
Merge commit 'v3.0.2' into linaro-3.0
Diffstat (limited to 'net/core/link_watch.c')
-rw-r--r-- | net/core/link_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index a7b34213186..357bd4ee4ba 100644 --- 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. */ |