diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-20 21:53:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-20 21:53:04 -0400 |
| commit | 17eea0df5f7068fc04959e655ef8f0a0ed097e19 (patch) | |
| tree | d44b5cceb813dddfd1e62fe9f92556cf113d62fd /net/core | |
| parent | 9b905fe68433378032b851c4d81a59187689fa52 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core')
| -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 30eb768cd677..cce9e53528b1 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
| @@ -3749,13 +3749,13 @@ static void __exit pg_cleanup(void) | |||
| 3749 | { | 3749 | { |
| 3750 | struct pktgen_thread *t; | 3750 | struct pktgen_thread *t; |
| 3751 | struct list_head *q, *n; | 3751 | struct list_head *q, *n; |
| 3752 | struct list_head list; | 3752 | LIST_HEAD(list); |
| 3753 | 3753 | ||
| 3754 | /* Stop all interfaces & threads */ | 3754 | /* Stop all interfaces & threads */ |
| 3755 | pktgen_exiting = true; | 3755 | pktgen_exiting = true; |
| 3756 | 3756 | ||
| 3757 | mutex_lock(&pktgen_thread_lock); | 3757 | mutex_lock(&pktgen_thread_lock); |
| 3758 | list_splice(&list, &pktgen_threads); | 3758 | list_splice_init(&pktgen_threads, &list); |
| 3759 | mutex_unlock(&pktgen_thread_lock); | 3759 | mutex_unlock(&pktgen_thread_lock); |
| 3760 | 3760 | ||
| 3761 | list_for_each_safe(q, n, &list) { | 3761 | list_for_each_safe(q, n, &list) { |