UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2012-05-19 10:10:59 -07:00
parent 62ade86ab6 d4b1133558
commit a2ae978756
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/core/pktgen.c
View File

@ -3755,13 +3755,13 @@ static void __exit pg_cleanup(void)
{ {
struct pktgen_thread *t; struct pktgen_thread *t;
struct list_head *q, *n; struct list_head *q, *n;
struct list_head list; LIST_HEAD(list);
/* Stop all interfaces & threads */ /* Stop all interfaces & threads */
pktgen_exiting = true; pktgen_exiting = true;
mutex_lock(&pktgen_thread_lock); mutex_lock(&pktgen_thread_lock);
list_splice(&list, &pktgen_threads); list_splice_init(&pktgen_threads, &list);
mutex_unlock(&pktgen_thread_lock); mutex_unlock(&pktgen_thread_lock);
list_for_each_safe(q, n, &list) { list_for_each_safe(q, n, &list) {