summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
diff options
context:
space:
mode:
authorAjay Singh2018-11-12 06:45:26 +0100
committerGreg Kroah-Hartman2018-11-12 23:46:51 +0100
commitd378599a6b6d1aeb6cad4d1d66a7ae2a567705ed (patch)
tree5799d90a578da0552065e0a463c106d47c759771 /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
parentstaging: wilc1000: move current_tx_rate enum to wilc_wlan_if.h file (diff)
downloadkernel-qcow2-linux-d378599a6b6d1aeb6cad4d1d66a7ae2a567705ed.tar.gz
kernel-qcow2-linux-d378599a6b6d1aeb6cad4d1d66a7ae2a567705ed.tar.xz
kernel-qcow2-linux-d378599a6b6d1aeb6cad4d1d66a7ae2a567705ed.zip
staging: wilc1000: rename firmware related constants to follow better namespace
Rename the firmware related macro by prefix with 'WILC_FW_' prefix for a better namespace. Also, move them to wilc_wlan_if.h file along with other FW related macros. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_cfgoperations.c')
-rw-r--r--drivers/staging/wilc1000/wilc_wfi_cfgoperations.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index b882fe939ddb..4cfa3ff4f058 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -612,15 +612,15 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
&hidden_ntwk))
return -ENOMEM;
- ret = wilc_scan(vif, USER_SCAN, WILC_FW_ACTIVE_SCAN,
- scan_ch_list,
+ ret = wilc_scan(vif, WILC_FW_USER_SCAN,
+ WILC_FW_ACTIVE_SCAN, scan_ch_list,
request->n_channels,
(const u8 *)request->ie,
request->ie_len, cfg_scan_result,
(void *)priv, &hidden_ntwk);
} else {
- ret = wilc_scan(vif, USER_SCAN, WILC_FW_ACTIVE_SCAN,
- scan_ch_list,
+ ret = wilc_scan(vif, WILC_FW_USER_SCAN,
+ WILC_FW_ACTIVE_SCAN, scan_ch_list,
request->n_channels,
(const u8 *)request->ie,
request->ie_len, cfg_scan_result,