Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2ae9787 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 62ade86a d4b11335

net/core/pktgen.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {