diff options
| author | Chaehyun Lim <chaehyun.lim@gmail.com> | 2016-02-25 09:15:50 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-25 22:30:09 -0800 |
| commit | 90f209daa4e9406a570303c1f666f0c5b11da245 (patch) | |
| tree | 70b9d0e2d0b4fd91a291bcb5ea834a64fd6af891 | |
| parent | bb76df5a4456612a42538d75c38a78013d8f4960 (diff) | |
| download | linux-90f209daa4e9406a570303c1f666f0c5b11da245.tar.bz2 | |
staging: wilc1000: rename u16reason in disconnect_info
This patch renames u16reason to reason to remove u16 prefix. There is no
need to use prefix to show data type.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/coreconfigurator.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 6256d7198546..63eca24c581f 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -115,7 +115,7 @@ struct connect_info { }; struct disconnect_info { - u16 u16reason; + u16 reason; u8 *ie; size_t ie_len; }; diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 4cdd3403e249..a6b7a22b2a88 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1552,7 +1552,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, Handle_ScanDone(vif, SCAN_EVENT_ABORTED); } - strDisconnectNotifInfo.u16reason = 0; + strDisconnectNotifInfo.reason = 0; strDisconnectNotifInfo.ie = NULL; strDisconnectNotifInfo.ie_len = 0; @@ -1889,7 +1889,7 @@ static void Handle_Disconnect(struct wilc_vif *vif) memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info)); - strDisconnectNotifInfo.u16reason = 0; + strDisconnectNotifInfo.reason = 0; strDisconnectNotifInfo.ie = NULL; strDisconnectNotifInfo.ie_len = 0; diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 83963a19bbe3..378c3505e2b0 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -559,11 +559,11 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, if (!pstrWFIDrv->p2p_connect) wlan_channel = INVALID_CHANNEL; if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) { - pstrDisconnectNotifInfo->u16reason = 3; + pstrDisconnectNotifInfo->reason = 3; } else if ((!pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) { - pstrDisconnectNotifInfo->u16reason = 1; + pstrDisconnectNotifInfo->reason = 1; } - cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie, + cfg80211_disconnected(dev, pstrDisconnectNotifInfo->reason, pstrDisconnectNotifInfo->ie, pstrDisconnectNotifInfo->ie_len, false, GFP_KERNEL); } |