aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/main.h
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2011-12-13 23:43:17 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-14 14:50:11 -0500
commit38c9d6641ff0664911aebe4ba67124f28169a972 (patch)
tree3811428abd934e0ff69a2182e66def04b39bb6f4 /drivers/net/wireless/mwifiex/main.h
parent00918d33c0e9966392e5a13aeacd712b9da473c9 (diff)
mwifiex: remove cfg_workqueue
cfg_workqueue was added to notify cfg80211 that scan, connect or disconnect is done by calling respective completion handlers. We can avoid use of this workqueue by calling those handlers from other places. 1) Call connect, disconnect completion handlers in their callback functions. ex. Call cfg80211_connect_result() in mwifiex_cfg80211_connect() 2) Call scan completion handler after parsing response of last scan command in a queue. After removing the workqueue, variables (assoc_request etc.) and checks used for mutual exclusion become redundant. Those are also removed in this patch. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: Nishant Sarmukadam <nishants@marvell.com> Signed-off-by: Kiran Divekar <dkiran@marvell.com> Signed-off-by: Bing Zhao <bzhao@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.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 41f88631763c..9207fc64641e 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -453,15 +453,8 @@ struct mwifiex_private {
453 u8 scan_pending_on_block; 453 u8 scan_pending_on_block;
454 u8 report_scan_result; 454 u8 report_scan_result;
455 struct cfg80211_scan_request *scan_request; 455 struct cfg80211_scan_request *scan_request;
456 int scan_result_status; 456 struct mwifiex_user_scan_cfg *user_scan_cfg;
457 int assoc_request;
458 u16 assoc_result;
459 int ibss_join_request;
460 u16 ibss_join_result;
461 bool disconnect;
462 u8 cfg_bssid[6]; 457 u8 cfg_bssid[6];
463 struct workqueue_struct *workqueue;
464 struct work_struct cfg_workqueue;
465 u8 country_code[IEEE80211_COUNTRY_STRING_LEN]; 458 u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
466 struct wps wps; 459 struct wps wps;
467 u8 scan_block; 460 u8 scan_block;