summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/main.h
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2014-05-14 15:20:08 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2014-05-14 15:20:08 +0200
commite21353576df1fae38710bdbff1c3abfe49f651cd (patch)
tree3074ad8e4be3762cae1e1f5d11d103ce8c216329 /drivers/net/wireless/mwifiex/main.h
parentath10k: fix firmware recovery with ap interface (diff)
parentrsi: Changed the return value to enable BA set-up (diff)
downloadlinux-e21353576df1fae38710bdbff1c3abfe49f651cd.tar.xz
linux-e21353576df1fae38710bdbff1c3abfe49f651cd.zip
Merge remote-tracking branch 'wireless-next/master' into ath-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.h')
-rw-r--r--drivers/net/wireless/mwifiex/main.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index d70457b26e26..34181192a666 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -674,7 +674,6 @@ struct mwifiex_if_ops {
void (*card_reset) (struct mwifiex_adapter *);
void (*fw_dump)(struct mwifiex_adapter *);
int (*clean_pcie_ring) (struct mwifiex_adapter *adapter);
- void (*iface_work)(struct work_struct *work);
};
struct mwifiex_adapter {
@@ -810,7 +809,6 @@ struct mwifiex_adapter {
bool ext_scan;
u8 fw_api_ver;
u8 fw_key_api_major_ver, fw_key_api_minor_ver;
- struct work_struct iface_work;
};
int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);