aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorAvinash Patil <patila@marvell.com>2015-02-25 11:45:41 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-03-03 08:43:38 -0500
commitbf97bf226ad9e23ccda91fbe803ab6ff69f6a5f3 (patch)
tree5f1d805d096321fa7deb216c84e15bb47eb7ecef /drivers/net/wireless/mwifiex
parent1114ce8f361f3ff880b28f508ba2b0995d1540bb (diff)
mwifiex: do not initialize ext_scan in mwifiex_init_adapter
Features which are device specific are already updated in interface specific initialization e.g. register_dev. We should not initialize them in mwifiex_init_adapter(); else this would overwrite earlier settings. Signed-off-by: Avinash Patil <patila@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index b77ba743e1c4..2e1df027b204 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -296,7 +296,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
296 memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter)); 296 memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
297 adapter->arp_filter_size = 0; 297 adapter->arp_filter_size = 0;
298 adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX; 298 adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
299 adapter->ext_scan = false;
300 adapter->key_api_major_ver = 0; 299 adapter->key_api_major_ver = 0;
301 adapter->key_api_minor_ver = 0; 300 adapter->key_api_minor_ver = 0;
302 memset(adapter->perm_addr, 0xff, ETH_ALEN); 301 memset(adapter->perm_addr, 0xff, ETH_ALEN);