diff options
| author | Binoy Jayan <binoy.jayan@linaro.org> | 2016-06-15 11:00:35 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 14:39:53 -0700 |
| commit | 334bed089d3d74e64a34b0ebee52b146b6778a6b (patch) | |
| tree | d09f5ea633c4c1fe318515d68f2a72a9b2b10e10 /drivers/staging/wilc1000/wilc_wfi_netdevice.h | |
| parent | b27a6d5e636ac80b223a18ca2b3c892f1caef9e3 (diff) | |
| download | op-kernel-dev-334bed089d3d74e64a34b0ebee52b146b6778a6b.zip op-kernel-dev-334bed089d3d74e64a34b0ebee52b146b6778a6b.tar.gz | |
staging: wilc1000: Replace semaphore txq_add_to_head_cs with mutex
The semaphore 'txq_add_to_head_cs' is a simple mutex, so it should be
written as one. Semaphores are going away in the future. Also, removing
the timeout scenario as the error handling code does not propagate the
timeout properly.
Signed-off-by: Binoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_netdevice.h')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 12d7c7b..239cd43 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -43,6 +43,7 @@ #include "wilc_wlan.h" #include <linux/wireless.h> #include <linux/completion.h> +#include <linux/mutex.h> #define FLOW_CONTROL_LOWER_THRESHOLD 128 #define FLOW_CONTROL_UPPER_THRESHOLD 256 @@ -171,7 +172,7 @@ struct wilc { struct wilc_vif *vif[NUM_CONCURRENT_IFC]; u8 open_ifcs; - struct semaphore txq_add_to_head_cs; + struct mutex txq_add_to_head_cs; spinlock_t txq_spinlock; struct mutex rxq_cs; |
