Skip to content

Commit

Permalink
[PKTGEN]: Convert thread lock to mutexes.
Browse files Browse the repository at this point in the history
pktgen's thread semaphores are strict mutexes, convert them to the
mutex implementation.

Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Luiz Capitulino authored and David S. Miller committed Mar 21, 2006
1 parent 6756ae4 commit 222fa07
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/core/pktgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/smp_lock.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
Expand Down Expand Up @@ -180,8 +181,8 @@
#define T_REMDEV (1<<4) /* Remove one dev */

/* Locks */
#define thread_lock() down(&pktgen_sem)
#define thread_unlock() up(&pktgen_sem)
#define thread_lock() mutex_lock(&pktgen_thread_lock)
#define thread_unlock() mutex_unlock(&pktgen_thread_lock)

/* If lock -- can be removed after some work */
#define if_lock(t) spin_lock(&(t->if_lock));
Expand Down Expand Up @@ -493,7 +494,7 @@ static int pg_delay_d;
static int pg_clone_skb_d;
static int debug;

static DECLARE_MUTEX(pktgen_sem);
static DEFINE_MUTEX(pktgen_thread_lock);
static LIST_HEAD(pktgen_threads);

static struct notifier_block pktgen_notifier_block = {
Expand Down

0 comments on commit 222fa07

Please sign in to comment.