Преглед на файлове

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
Linus Torvalds преди 13 години
родител
ревизия
a2ae978756
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      net/core/pktgen.c

+ 2 - 2
net/core/pktgen.c

@@ -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) {