Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed May 19, 2012
2 parents 62ade86 + d4b1133 commit a2ae978
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/core/pktgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a2ae978

Please sign in to comment.