diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
| commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
| tree | f12706b80194f48aad3a1bd70ae9215d48875591 /net/core/pktgen.c | |
| parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
| parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/core/pktgen.c')
| -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) { |