From: Glen Lee <glen.lee@atmel.com>
To: <gregkh@linuxfoundation.org>
Cc: <devel@driverdev.osuosl.org>, <linux-wireless@vger.kernel.org>,
<tony.cho@atmel.com>, <glen.lee@atmel.com>, <leo.kim@atmel.com>,
<austin.shin@atmel.com>, <Chris.Park@atmel.com>,
<adham.abozaeid@atmel.com>, <Nicolas.FERRE@atmel.com>
Subject: [PATCH RESEND 48/70] staging: wilc1000: renames struct connect_resp_info variables
Date: Thu, 4 Feb 2016 18:24:09 +0900 [thread overview]
Message-ID: <1454577871-667-9-git-send-email-glen.lee@atmel.com> (raw)
In-Reply-To: <1454577871-667-1-git-send-email-glen.lee@atmel.com>
From: Leo Kim <leo.kim@atmel.com>
This patch renames to avoid camelcase and remove prefix names,
changes follow are:
- u16capability to capability
- u16ConnectStatus to status
- u16AssocID to assoc_id
- pu8RespIEs to ies
- u16RespIEsLen to ies_len
Signed-off-by: Leo Kim <leo.kim@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 14 +++++++-------
drivers/staging/wilc1000/coreconfigurator.h | 10 +++++-----
drivers/staging/wilc1000/host_interface.c | 14 +++++++-------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index c456a32..e9f6262 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -367,19 +367,19 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
assoc_resp_len = (u16)buffer_len;
- connect_resp_info->u16ConnectStatus = get_asoc_status(buffer);
- if (connect_resp_info->u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
- connect_resp_info->u16capability = get_assoc_resp_cap_info(buffer);
- connect_resp_info->u16AssocID = get_asoc_id(buffer);
+ connect_resp_info->status = get_asoc_status(buffer);
+ if (connect_resp_info->status == SUCCESSFUL_STATUSCODE) {
+ connect_resp_info->capability = get_assoc_resp_cap_info(buffer);
+ connect_resp_info->assoc_id = get_asoc_id(buffer);
ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
- connect_resp_info->pu8RespIEs = kmemdup(ies, ies_len, GFP_KERNEL);
- if (!connect_resp_info->pu8RespIEs)
+ connect_resp_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
+ if (!connect_resp_info->ies)
return -ENOMEM;
- connect_resp_info->u16RespIEsLen = ies_len;
+ connect_resp_info->ies_len = ies_len;
}
*ret_connect_resp_info = connect_resp_info;
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 611486b..aa9aee6 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -98,11 +98,11 @@ typedef struct {
} tstrNetworkInfo;
struct connect_resp_info {
- u16 u16capability;
- u16 u16ConnectStatus;
- u16 u16AssocID;
- u8 *pu8RespIEs;
- u16 u16RespIEsLen;
+ u16 capability;
+ u16 status;
+ u16 assoc_id;
+ u8 *ies;
+ u16 ies_len;
};
typedef struct {
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 513b1f0..992008b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1489,19 +1489,19 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (s32Err) {
PRINT_ER("wilc_parse_assoc_resp_info() returned error %d\n", s32Err);
} else {
- strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->u16ConnectStatus;
+ strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->status;
if (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
- if (pstrConnectRespInfo->pu8RespIEs) {
- strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->u16RespIEsLen;
- strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->u16RespIEsLen, GFP_KERNEL);
- memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->pu8RespIEs,
- pstrConnectRespInfo->u16RespIEsLen);
+ if (pstrConnectRespInfo->ies) {
+ strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->ies_len;
+ strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
+ memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->ies,
+ pstrConnectRespInfo->ies_len);
}
}
if (pstrConnectRespInfo) {
- kfree(pstrConnectRespInfo->pu8RespIEs);
+ kfree(pstrConnectRespInfo->ies);
kfree(pstrConnectRespInfo);
}
}
--
1.9.1
next prev parent reply other threads:[~2016-02-04 9:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 9:24 [PATCH RESEND 40/70] staging: wilc1000: wilc_wlan.c: replaces PRINT_ER with netdev_err Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 41/70] staging: wilc1000: linux_mon.c: " Glen Lee
2016-02-07 21:44 ` Greg KH
2016-02-04 9:24 ` [PATCH RESEND 42/70] staging: wilc1000: remove unused log message using the CORECONFIG_DBG tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 43/70] staging: wilc1000: remove unused log message using the HOSTINF_DBG tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 44/70] staging: wilc1000: remove unused log message using the TX_DBG tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 45/70] staging: wilc1000: removes function 'wilc_dealloc_network_info()' Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 46/70] staging: wilc1000: removes function 'wilc_dealloc_assoc_resp_info()' Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 47/70] staging: wilc1000: remove typedef from tstrConnectRespInfo Glen Lee
2016-02-04 9:24 ` Glen Lee [this message]
2016-02-04 9:24 ` [PATCH RESEND 49/70] staging: wilc1000: remove typedef from pstrNetworkInfo Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 50/70] staging: wilc1000: renames s8rssi of connect_resp_info structure Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 51/70] staging: wilc1000: renames u16CapInfo " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 52/70] staging: wilc1000: renames au8ssid " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 53/70] staging: wilc1000: renames u8SsidLen " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 54/70] staging: wilc1000: renames au8bssid " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 55/70] staging: wilc1000: renames u16BeaconPeriod " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 56/70] staging: wilc1000: renames u8DtimPeriod " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 57/70] staging: wilc1000: renames u8channel " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 58/70] staging: wilc1000: renames struct connect_resp_info variables Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 59/70] staging: wilc1000: renames bNewNetwork of connect_resp_info structure Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 60/70] staging: wilc1000: renames u8Found " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 61/70] staging: wilc1000: renames u32Tsf " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 62/70] staging: wilc1000: renames struct connect_resp_info variables Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 63/70] staging: wilc1000: renames pJoinParams of connect_resp_info structure Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 64/70] staging: wilc1000: renames strRssi " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 65/70] staging: wilc1000: renames u64Tsf " Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 66/70] staging: wilc1000: remove unnecessary wilc_rx_complete function Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 67/70] staging: wilc1000: remove unused log message using the RX_DBG tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 68/70] staging: wilc1000: remove unused debug tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 69/70] staging: wilc1000: remove unnecessary log message using GENERIC_DBG tag Glen Lee
2016-02-04 9:24 ` [PATCH RESEND 70/70] staging: wilc1000: remove warnings line over 80 characters Glen Lee
2016-02-04 17:38 ` Joe Perches
2016-02-07 21:43 ` [PATCH RESEND 40/70] staging: wilc1000: wilc_wlan.c: replaces PRINT_ER with netdev_err Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454577871-667-9-git-send-email-glen.lee@atmel.com \
--to=glen.lee@atmel.com \
--cc=Chris.Park@atmel.com \
--cc=Nicolas.FERRE@atmel.com \
--cc=adham.abozaeid@atmel.com \
--cc=austin.shin@atmel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=leo.kim@atmel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=tony.cho@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).