diff options
author | Avinash Patil <patila@marvell.com> | 2014-11-05 06:34:27 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:31:12 -0500 |
commit | ec4a16b4d287d4d0f7465ae7e61ce4e9021d715c (patch) | |
tree | 779b020cfe1b7ac9156c1fd75d74d5cecc7b83fe /drivers/net/wireless/mwifiex/main.h | |
parent | d385c5c2860075e1f3e03074f043dd8a828b2862 (diff) |
mwifiex: rx workqueue support for USB interface
This patch adds RX workqueue support for USB interfaces.
Currently rx_pending is applicable for cmd/events and Rx
data in USB interface. Let's use it only for Rx data.
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index fb47731d45a6..c7fdd8238f45 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -106,10 +106,7 @@ enum { | |||
106 | */ | 106 | */ |
107 | #define IS_CARD_RX_RCVD(adapter) (adapter->cmd_resp_received || \ | 107 | #define IS_CARD_RX_RCVD(adapter) (adapter->cmd_resp_received || \ |
108 | adapter->event_received || \ | 108 | adapter->event_received || \ |
109 | ((adapter->iface_type != MWIFIEX_USB) && \ | 109 | adapter->data_received) |
110 | adapter->data_received) || \ | ||
111 | ((adapter->iface_type == MWIFIEX_USB) && \ | ||
112 | !skb_queue_empty(&adapter->usb_rx_data_q))) | ||
113 | 110 | ||
114 | #define MWIFIEX_TYPE_CMD 1 | 111 | #define MWIFIEX_TYPE_CMD 1 |
115 | #define MWIFIEX_TYPE_DATA 0 | 112 | #define MWIFIEX_TYPE_DATA 0 |
@@ -766,7 +763,6 @@ struct mwifiex_adapter { | |||
766 | spinlock_t scan_pending_q_lock; | 763 | spinlock_t scan_pending_q_lock; |
767 | /* spin lock for RX processing routine */ | 764 | /* spin lock for RX processing routine */ |
768 | spinlock_t rx_proc_lock; | 765 | spinlock_t rx_proc_lock; |
769 | struct sk_buff_head usb_rx_data_q; | ||
770 | u32 scan_processing; | 766 | u32 scan_processing; |
771 | u16 region_code; | 767 | u16 region_code; |
772 | struct mwifiex_802_11d_domain_reg domain_reg; | 768 | struct mwifiex_802_11d_domain_reg domain_reg; |