diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 10:10:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 10:10:59 -0700 |
| commit | a2ae9787568ac50978c03ce67bfb79ad2e100cca (patch) | |
| tree | 2148bceaa586c61a59528f8265882860fa055cfa | |
| parent | 62ade86ab6c7e26409229ca45503cae97bf698cf (diff) | |
| parent | d4b1133558e0d417342d5d2c49e4c35b428ff20d (diff) | |
| download | linux-a2ae9787568ac50978c03ce67bfb79ad2e100cca.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull one more networking bug-fix from David Miller:
"One last straggler.
Eric Dumazet's pktgen unload oops fix was not entirely complete, but
all the cases should be handled properly now.... fingers crossed."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
pktgen: fix module unload for good
| -rw-r--r-- | net/core/pktgen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 77a59980b579..b81369b6ddc0 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3755,13 +3755,13 @@ static void __exit pg_cleanup(void) { struct pktgen_thread *t; struct list_head *q, *n; - struct list_head list; + LIST_HEAD(list); /* Stop all interfaces & threads */ pktgen_exiting = true; mutex_lock(&pktgen_thread_lock); - list_splice(&list, &pktgen_threads); + list_splice_init(&pktgen_threads, &list); mutex_unlock(&pktgen_thread_lock); list_for_each_safe(q, n, &list) { |