diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 22:44:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 22:44:44 +0300 |
| commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
| tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /net/core | |
| parent | 889b8f964f2f226b7cd5a0a515109e3d8d9d1613 (diff) | |
| parent | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (diff) | |
| download | linux-b1109bf085c8dd69537b7876ea83f914dd1fe46a.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dst.c | 2 | ||||
| -rw-r--r-- | net/core/pktgen.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 57bc4d5b8d08..cb1b3488b739 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -17,6 +17,7 @@ #include <linux/string.h> #include <linux/types.h> #include <net/net_namespace.h> +#include <linux/sched.h> #include <net/dst.h> @@ -79,6 +80,7 @@ loop: while ((dst = next) != NULL) { next = dst->next; prefetch(&next->next); + cond_resched(); if (likely(atomic_read(&dst->__refcnt))) { last->next = dst; last = dst; diff --git a/net/core/pktgen.c b/net/core/pktgen.c index de0c2c726420..2e692afdc55d 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3524,6 +3524,7 @@ static int pktgen_thread_worker(void *arg) wait_event_interruptible_timeout(t->queue, t->control != 0, HZ/10); + try_to_freeze(); continue; } |