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>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4dfdc7c51a2c851091dee247cc964982bc76446b..c238d391f8a600b41ae292e1a4e4abafcee03656 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3485,11 +3485,11 @@ void wilc_frame_register(struct wilc_vif *vif, u16 frame_type, bool reg)
 
        switch (frame_type) {
        case IEEE80211_STYPE_ACTION:
-               msg->body.reg_frame.reg_id = ACTION_FRM_IDX;
+               msg->body.reg_frame.reg_id = WILC_FW_ACTION_FRM_IDX;
                break;
 
        case IEEE80211_STYPE_PROBE_REQ:
-               msg->body.reg_frame.reg_id = PROBE_REQ_IDX;
+               msg->body.reg_frame.reg_id = WILC_FW_PROBE_REQ_IDX;
                break;
 
        default:

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 91e60e3f5f0bf03fe4552f2db916a901601b7cad..610ca2b57dd0224ddebb4f534c15ac0651429b22 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -15,13 +15,7 @@
 #define GO_MODE                0x03
 #define CLIENT_MODE    0x04
 
-#define ACTION_FRM_IDX                         0
-#define PROBE_REQ_IDX                          1
 #define MAX_NUM_STA                            9
-#define DEFAULT_SCAN                           0
-#define USER_SCAN                              BIT(0)
-#define OBSS_PERIODIC_SCAN                     BIT(1)
-#define OBSS_ONETIME_SCAN                      BIT(2)
 #define ADDKEY                                 0x1
 #define REMOVEKEY                              0x2
 #define DEFAULTKEY                             0x4

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index b882fe939ddb44112bda7ba1e3a1d6916cdabd07..4cfa3ff4f05843fe19a1b3fc27a4000db181f1c8 100644 (file)
--- 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,

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 36d690595620cc84e8bfbc09f8a27f4fa6ab8876..f4f6ac628a91b4f56f46721d864c0606539bbceb 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -209,6 +209,18 @@ enum {
        WILC_FW_TX_RATE_MBPS_54 = 54
 };
 
+enum {
+       WILC_FW_DEFAULT_SCAN = 0,
+       WILC_FW_USER_SCAN = BIT(0),
+       WILC_FW_OBSS_PERIODIC_SCAN = BIT(1),
+       WILC_FW_OBSS_ONETIME_SCAN = BIT(2)
+};
+
+enum {
+       WILC_FW_ACTION_FRM_IDX = 0,
+       WILC_FW_PROBE_REQ_IDX = 1
+};
+
 enum wid_type {
        WID_CHAR                = 0,
        WID_SHORT               = 1,