staging: wilc1000: remove enum connect_status instead use ieee80211_statuscode

Cleanup patch to remove the use of enum 'connect_status' and instead use
predefined 'ieee80211_statuscode' for error code values.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 006389587152f91b93ade4a9d874ebef947c88fe..a9879536b6a621c1a277a9e2d03d6e26173c030e 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <linux/ieee80211.h>
+
 #include "coreconfigurator.h"
 
 #define TAG_PARAM_OFFSET       (MAC_HDR_LEN + TIME_STAMP_LEN + \
@@ -316,7 +318,7 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
        u16 ies_len = 0;
 
        ret_conn_info->status = get_asoc_status(buffer);
-       if (ret_conn_info->status == SUCCESSFUL_STATUSCODE) {
+       if (ret_conn_info->status == WLAN_STATUS_SUCCESS) {
                ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
                ies_len = buffer_len - (CAP_INFO_LEN + STATUS_CODE_LEN +
                                        AID_LEN);

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 55b5531856f88bd8d36df133efeed83981123457..90d3d656e8cdf0100a919b07db08bb694dc1198f 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -24,26 +24,6 @@
 #define MAKE_WORD16(lsb, msb) ((((u16)(msb) << 8) & 0xFF00) | (lsb))
 #define MAKE_WORD32(lsw, msw) ((((u32)(msw) << 16) & 0xFFFF0000) | (lsw))
 
-enum connect_status {
-       SUCCESSFUL_STATUSCODE    = 0,
-       UNSPEC_FAIL              = 1,
-       UNSUP_CAP                = 10,
-       REASOC_NO_ASOC           = 11,
-       FAIL_OTHER               = 12,
-       UNSUPT_ALG               = 13,
-       AUTH_SEQ_FAIL            = 14,
-       CHLNG_FAIL               = 15,
-       AUTH_TIMEOUT             = 16,
-       AP_FULL                  = 17,
-       UNSUP_RATE               = 18,
-       SHORT_PREAMBLE_UNSUP     = 19,
-       PBCC_UNSUP               = 20,
-       CHANNEL_AGIL_UNSUP       = 21,
-       SHORT_SLOT_UNSUP         = 25,
-       OFDM_DSSS_UNSUP          = 26,
-       CONNECT_STS_FORCE_16_BIT = 0xFFFF
-};
-
 struct rssi_history_buffer {
        bool full;
        u8 index;

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 918d06e8cd34c24e673bf73ef20ba261273c1099..9b5bf3cad5995c93cbeeb2fb1ca03624b9aed303 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1336,7 +1336,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
        }
 
        if (mac_status == MAC_STATUS_CONNECTED &&
-           conn_info.status != SUCCESSFUL_STATUSCODE) {
+           conn_info.status != WLAN_STATUS_SUCCESS) {
                netdev_err(vif->ndev,
                           "Received MAC status is MAC_STATUS_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");
                eth_zero_addr(wilc_connected_ssid);
@@ -1349,7 +1349,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
                memcpy(conn_info.bssid, hif_drv->usr_conn_req.bssid, 6);
 
                if (mac_status == MAC_STATUS_CONNECTED &&
-                   conn_info.status == SUCCESSFUL_STATUSCODE) {
+                   conn_info.status == WLAN_STATUS_SUCCESS) {
                        memcpy(hif_drv->assoc_bssid,
                               hif_drv->usr_conn_req.bssid, ETH_ALEN);
                }
@@ -1369,7 +1369,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
                                          hif_drv->usr_conn_req.arg);
 
        if (mac_status == MAC_STATUS_CONNECTED &&
-           conn_info.status == SUCCESSFUL_STATUSCODE) {
+           conn_info.status == WLAN_STATUS_SUCCESS) {
                wilc_set_power_mgmt(vif, 0, 0);
 
                hif_drv->hif_state = HOST_IF_CONNECTED;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e96163f38e7bbab65b38b93151a81d6b35a8d3a5..f90b9b68e9e003f6b7a4074a194804edf83eff42 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -489,7 +489,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
                connect_status = conn_info->status;
 
                if (mac_status == MAC_STATUS_DISCONNECTED &&
-                   conn_info->status == SUCCESSFUL_STATUSCODE) {
+                   conn_info->status == WLAN_STATUS_SUCCESS) {
                        connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE;
                        wilc_wlan_set_bssid(priv->dev, null_bssid,
                                            STATION_MODE);