korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-21 13:24:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: rename struct tstrDisconnectNotifInfo

Browse Source 
This patch renames struct tstrDisconnectNotifInfo to disconnect_info to
avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2016-02-25 09:15:49 +09:00 committed by Greg Kroah-Hartman
parent 134b4cf2d5
commit bb76df5a44
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/wilc1000/coreconfigurator.h
View File

@ -114,11 +114,11 @@ struct connect_info {
u16 status; u16 status;
}; };
typedef struct { struct disconnect_info {
u16 u16reason; u16 u16reason;
u8 *ie; u8 *ie;
size_t ie_len; size_t ie_len;
} tstrDisconnectNotifInfo; };
s32 wilc_parse_network_info(u8 *msg_buffer, s32 wilc_parse_network_info(u8 *msg_buffer,
struct network_info **ret_network_info); struct network_info **ret_network_info);

8
drivers/staging/wilc1000/host_interface.c
View File

@ -1411,7 +1411,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
u8 u8MacStatusReasonCode; u8 u8MacStatusReasonCode;
u8 u8MacStatusAdditionalInfo; u8 u8MacStatusAdditionalInfo;
struct connect_info strConnectInfo; struct connect_info strConnectInfo;
tstrDisconnectNotifInfo strDisconnectNotifInfo; struct disconnect_info strDisconnectNotifInfo;
s32 s32Err = 0; s32 s32Err = 0;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
@ -1545,7 +1545,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
hif_drv->usr_conn_req.ies = NULL; hif_drv->usr_conn_req.ies = NULL;
} else if ((u8MacStatus == MAC_DISCONNECTED) && } else if ((u8MacStatus == MAC_DISCONNECTED) &&
(hif_drv->hif_state == HOST_IF_CONNECTED)) { (hif_drv->hif_state == HOST_IF_CONNECTED)) {
memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo)); memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info));
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
del_timer(&hif_drv->scan_timer); del_timer(&hif_drv->scan_timer);
@ -1885,9 +1885,9 @@ static void Handle_Disconnect(struct wilc_vif *vif)
if (result) { if (result) {
netdev_err(vif->ndev, "Failed to send dissconect\n"); netdev_err(vif->ndev, "Failed to send dissconect\n");
} else { } else {
tstrDisconnectNotifInfo strDisconnectNotifInfo; struct disconnect_info strDisconnectNotifInfo;
memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo)); memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info));
strDisconnectNotifInfo.u16reason = 0; strDisconnectNotifInfo.u16reason = 0;
strDisconnectNotifInfo.ie = NULL; strDisconnectNotifInfo.ie = NULL;

2
drivers/staging/wilc1000/host_interface.h
View File

@ -174,7 +174,7 @@ typedef void (*wilc_scan_result)(enum scan_event, struct network_info *,
typedef void (*wilc_connect_result)(enum conn_event, typedef void (*wilc_connect_result)(enum conn_event,
struct connect_info *, struct connect_info *,
u8, u8,
tstrDisconnectNotifInfo *, struct disconnect_info *,
void *); void *);
typedef void (*wilc_remain_on_chan_expired)(void *, u32); typedef void (*wilc_remain_on_chan_expired)(void *, u32);

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

@ -481,7 +481,7 @@ int wilc_connecting;
static void CfgConnectResult(enum conn_event enuConnDisconnEvent, static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
struct connect_info *pstrConnectInfo, struct connect_info *pstrConnectInfo,
u8 u8MacStatus, u8 u8MacStatus,
tstrDisconnectNotifInfo *pstrDisconnectNotifInfo, struct disconnect_info *pstrDisconnectNotifInfo,
void *pUserVoid) void *pUserVoid)
{ {
struct wilc_priv *priv; struct wilc_priv *priv;