mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 11:55:37 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: use enum contants for mac status & added 'WILC_' prefix

Browse source 
Clubbed mac status constants inside the enum constant and also added
'WILC_' prefix to have better namespace.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-11-12 05:45:14 +00:00 committed by Greg Kroah-Hartman
parent 065a69a922
commit 8c4574d6c8
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/wilc1000/host_interface.c
View file

@ -797,7 +797,8 @@ static void handle_connect(struct work_struct *work)
} }
conn_attr->result(CONN_DISCONN_EVENT_CONN_RESP, conn_attr->result(CONN_DISCONN_EVENT_CONN_RESP,
&conn_info, MAC_STATUS_DISCONNECTED, &conn_info,
WILC_MAC_STATUS_DISCONNECTED,
NULL, conn_attr->arg); NULL, conn_attr->arg);
hif_drv->hif_state = HOST_IF_IDLE; hif_drv->hif_state = HOST_IF_IDLE;
kfree(conn_info.req_ies); kfree(conn_info.req_ies);
@ -857,7 +858,7 @@ static void handle_connect_timeout(struct work_struct *work)
hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP, hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP,
&info, &info,
MAC_STATUS_DISCONNECTED, WILC_MAC_STATUS_DISCONNECTED,
NULL, NULL,
hif_drv->usr_conn_req.arg); hif_drv->usr_conn_req.arg);
@ -1286,7 +1287,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
memset(&conn_info, 0, sizeof(struct connect_info)); memset(&conn_info, 0, sizeof(struct connect_info));
if (mac_status == MAC_STATUS_CONNECTED) { if (mac_status == WILC_MAC_STATUS_CONNECTED) {
u32 assoc_resp_info_len; u32 assoc_resp_info_len;
memset(hif_drv->assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE); memset(hif_drv->assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);
@ -1311,7 +1312,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
if (hif_drv->usr_conn_req.bssid) { if (hif_drv->usr_conn_req.bssid) {
memcpy(conn_info.bssid, hif_drv->usr_conn_req.bssid, 6); memcpy(conn_info.bssid, hif_drv->usr_conn_req.bssid, 6);
if (mac_status == MAC_STATUS_CONNECTED && if (mac_status == WILC_MAC_STATUS_CONNECTED &&
conn_info.status == WLAN_STATUS_SUCCESS) { conn_info.status == WLAN_STATUS_SUCCESS) {
memcpy(hif_drv->assoc_bssid, memcpy(hif_drv->assoc_bssid,
hif_drv->usr_conn_req.bssid, ETH_ALEN); hif_drv->usr_conn_req.bssid, ETH_ALEN);
@ -1331,7 +1332,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
&conn_info, mac_status, NULL, &conn_info, mac_status, NULL,
hif_drv->usr_conn_req.arg); hif_drv->usr_conn_req.arg);
if (mac_status == MAC_STATUS_CONNECTED && if (mac_status == WILC_MAC_STATUS_CONNECTED &&
conn_info.status == WLAN_STATUS_SUCCESS) { conn_info.status == WLAN_STATUS_SUCCESS) {
wilc_set_power_mgmt(vif, 0, 0); wilc_set_power_mgmt(vif, 0, 0);
@ -1423,10 +1424,10 @@ static void handle_rcvd_gnrl_async_info(struct work_struct *work)
mac_status = rcvd_info->buffer[7]; mac_status = rcvd_info->buffer[7];
if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) { if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {
host_int_parse_assoc_resp_info(vif, mac_status); host_int_parse_assoc_resp_info(vif, mac_status);
} else if ((mac_status == MAC_STATUS_DISCONNECTED) && } else if ((mac_status == WILC_MAC_STATUS_DISCONNECTED) &&
(hif_drv->hif_state == HOST_IF_CONNECTED)) { (hif_drv->hif_state == HOST_IF_CONNECTED)) {
host_int_handle_disconnect(vif); host_int_handle_disconnect(vif);
} else if ((mac_status == MAC_STATUS_DISCONNECTED) && } else if ((mac_status == WILC_MAC_STATUS_DISCONNECTED) &&
(hif_drv->usr_scan_req.scan_result)) { (hif_drv->usr_scan_req.scan_result)) {
del_timer(&hif_drv->scan_timer); del_timer(&hif_drv->scan_timer);
if (hif_drv->usr_scan_req.scan_result) if (hif_drv->usr_scan_req.scan_result)

4
drivers/staging/wilc1000/linux_wlan.c
View file

@ -162,7 +162,7 @@ void wilc_mac_indicate(struct wilc *wilc)
s8 status; s8 status;
wilc_wlan_cfg_get_val(wilc, WID_STATUS, &status, 1); wilc_wlan_cfg_get_val(wilc, WID_STATUS, &status, 1);
if (wilc->mac_status == MAC_STATUS_INIT) { if (wilc->mac_status == WILC_MAC_STATUS_INIT) {
wilc->mac_status = status; wilc->mac_status = status;
complete(&wilc->sync_event); complete(&wilc->sync_event);
} else { } else {
@ -624,7 +624,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
struct wilc *wl = vif->wilc; struct wilc *wl = vif->wilc;
if (!wl->initialized) { if (!wl->initialized) {
wl->mac_status = MAC_STATUS_INIT; wl->mac_status = WILC_MAC_STATUS_INIT;
wl->close = 0; wl->close = 0;
wlan_init_locks(dev); wlan_init_locks(dev);

2
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file

@ -470,7 +470,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
connect_status = conn_info->status; connect_status = conn_info->status;
if (mac_status == MAC_STATUS_DISCONNECTED && if (mac_status == WILC_MAC_STATUS_DISCONNECTED &&
conn_info->status == WLAN_STATUS_SUCCESS) { conn_info->status == WLAN_STATUS_SUCCESS) {
connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE; connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, null_bssid, wilc_wlan_set_bssid(priv->dev, null_bssid,

8
drivers/staging/wilc1000/wilc_wlan_if.h
View file

@ -24,9 +24,11 @@
* *
********************************************/ ********************************************/
#define MAC_STATUS_INIT -1 enum {
#define MAC_STATUS_CONNECTED 1 WILC_MAC_STATUS_INIT = -1,
#define MAC_STATUS_DISCONNECTED 0 WILC_MAC_STATUS_DISCONNECTED = 0,
WILC_MAC_STATUS_CONNECTED = 1
};
struct tx_complete_data { struct tx_complete_data {
int size; int size;