redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: wilc1000: move 'txq_spinlock_flags' from 'wilc' structure to local variable 

Cleanup patch to remove 'txq_spinlock_flags' element in 'wilc' and used
local variable 'flag' in wilc_wlan_txq_filter_dup_tcp_ack().

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Ajay Singh 2018-06-04 10:59:10 +05:30 committed by Greg Kroah-Hartman
parent 42e4a3adb0
commit 089a137ad2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -155,8 +155,6 @@ struct wilc {
u32 rx_buffer_offset;
u8 *tx_buffer;
unsigned long txq_spinlock_flags;
struct txq_entry_t txq_head;
int txq_entries;
int txq_exit;

5
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -219,11 +219,12 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev)
struct wilc *wilc;
u32 i = 0;
u32 dropped = 0;
unsigned long flags;
vif = netdev_priv(dev);
wilc = vif->wilc;
spin_lock_irqsave(&wilc->txq_spinlock, wilc->txq_spinlock_flags);
spin_lock_irqsave(&wilc->txq_spinlock, flags);
for (i = pending_base; i < (pending_base + pending_acks); i++) {
u32 session_index;
u32 bigger_ack_num;
@ -261,7 +262,7 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev)
else
pending_base = 0;
spin_unlock_irqrestore(&wilc->txq_spinlock, wilc->txq_spinlock_flags);
spin_unlock_irqrestore(&wilc->txq_spinlock, flags);
while (dropped > 0) {
wait_for_completion_timeout(&wilc->txq_event,