There are over-commenting in the coreconfigurator.c file and most of them
are not helpful to explain what the code does and generate 80 ending
line over warnings. So, all of comments are removed in this patch and the
comments will later be added if necessary with the preferred Linux style.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 141 +---------------------------
1 file changed, 1 insertion(+), 140 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index d101393..37d40bb 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -1,13 +1,3 @@
-
-/*!
- * @file coreconfigurator.c
- * @brief
- * @author
- * @sa coreconfigurator.h
- * @date 1 Mar 2012
- * @version 1.0
- */
-
#include "coreconfigurator.h"
#include "wilc_wlan_if.h"
#include "wilc_wlan.h"
@@ -16,7 +6,6 @@
#define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
BEACON_INTERVAL_LEN + CAP_INFO_LEN)
-/* Basic Frame Type Codes (2-bit) */
enum basic_frame_type {
FRAME_TYPE_CONTROL = 0x04,
FRAME_TYPE_DATA = 0x08,
@@ -25,7 +14,6 @@ enum basic_frame_type {
FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF
};
-/* Frame Type and Subtype Codes (6-bit) */
enum sub_frame_type {
ASSOC_REQ = 0x00,
ASSOC_RSP = 0x10,
@@ -65,7 +53,6 @@ enum sub_frame_type {
FRAME_SUBTYPE_FORCE_32BIT = 0xFFFFFFFF
};
-/* Element ID of various Information Elements */
enum info_element_id {
ISSID = 0, /* Service Set Identifier */
ISUPRATES = 1, /* Supported Rates */
@@ -109,8 +96,6 @@ enum info_element_id {
INFOELEM_ID_FORCE_32BIT = 0xFFFFFFFF
};
-/* This function extracts the beacon period field from the beacon or probe */
-/* response frame. */
static inline u16 get_beacon_period(u8 *data)
{
u16 bcn_per;
@@ -147,54 +132,36 @@ static inline u32 get_beacon_timestamp_hi(u8 *data)
return time_stamp;
}
-/* This function extracts the 'frame type and sub type' bits from the MAC */
-/* header of the input frame. */
-/* Returns the value in the LSB of the returned value. */
static inline enum sub_frame_type get_sub_type(u8 *header)
{
return ((enum sub_frame_type)(header[0] & 0xFC));
}
-/* This function extracts the 'to ds' bit from the MAC header of the input */
-/* frame. */
-/* Returns the value in the LSB of the returned value. */
static inline u8 get_to_ds(u8 *header)
{
return (header[1] & 0x01);
}
-/* This function extracts the 'from ds' bit from the MAC header of the input */
-/* frame. */
-/* Returns the value in the LSB of the returned value. */
static inline u8 get_from_ds(u8 *header)
{
return ((header[1] & 0x02) >> 1);
}
-/* This function extracts the MAC Address in 'address1' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
static inline void get_address1(u8 *pu8msa, u8 *addr)
{
memcpy(addr, pu8msa + 4, 6);
}
-/* This function extracts the MAC Address in 'address2' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
static inline void get_address2(u8 *pu8msa, u8 *addr)
{
memcpy(addr, pu8msa + 10, 6);
}
-/* This function extracts the MAC Address in 'address3' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
static inline void get_address3(u8 *pu8msa, u8 *addr)
{
memcpy(addr, pu8msa + 16, 6);
}
-/* This function extracts the BSSID from the incoming WLAN packet based on */
-/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
-/* variable. */
static inline void get_BSSID(u8 *data, u8 *bssid)
{
if (get_from_ds(data) == 1)
@@ -205,7 +172,6 @@ static inline void get_BSSID(u8 *data, u8 *bssid)
get_address3(data, bssid);
}
-/* This function extracts the SSID from a beacon/probe response frame */
static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len)
{
u8 len = 0;
@@ -217,8 +183,6 @@ static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len)
j = MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN +
CAP_INFO_LEN + 2;
- /* If the SSID length field is set wrongly to a value greater than the */
- /* allowed maximum SSID length limit, reset the length to 0 */
if (len >= MAX_SSID_LEN)
len = 0;
@@ -230,8 +194,6 @@ static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len)
*p_ssid_len = len;
}
-/* This function extracts the capability info field from the beacon or probe */
-/* response frame. */
static inline u16 get_cap_info(u8 *data)
{
u16 cap_info = 0;
@@ -240,8 +202,6 @@ static inline u16 get_cap_info(u8 *data)
st = get_sub_type(data);
- /* Location of the Capability field is different for Beacon and */
- /* Association frames. */
if ((st == BEACON) || (st == PROBE_RSP))
index += TIME_STAMP_LEN + BEACON_INTERVAL_LEN;
@@ -251,8 +211,6 @@ static inline u16 get_cap_info(u8 *data)
return cap_info;
}
-/* This function extracts the capability info field from the Association */
-/* response frame. */
static inline u16 get_assoc_resp_cap_info(u8 *data)
{
u16 cap_info;
@@ -263,8 +221,6 @@ static inline u16 get_assoc_resp_cap_info(u8 *data)
return cap_info;
}
-/* This function extracts the association status code from the incoming */
-/* association response frame and returns association status code */
static inline u16 get_asoc_status(u8 *data)
{
u16 asoc_status;
@@ -275,8 +231,6 @@ static inline u16 get_asoc_status(u8 *data)
return asoc_status;
}
-/* This function extracts association ID from the incoming association */
-/* response frame */
static inline u16 get_asoc_id(u8 *data)
{
u16 asoc_id;
@@ -291,19 +245,8 @@ static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)
{
u16 u16index;
- /*************************************************************************/
- /* Beacon Frame - Frame Body */
- /* --------------------------------------------------------------------- */
- /* |Timestamp |BeaconInt |CapInfo |SSID |SupRates |DSParSet |TIM elm | */
- /* --------------------------------------------------------------------- */
- /* |8 |2 |2 |2-34 |3-10 |3 |4-256 | */
- /* --------------------------------------------------------------------- */
- /* */
- /*************************************************************************/
-
u16index = u16TagParamOffset;
- /* Search for the TIM Element Field and return if the element is found */
while (u16index < (u16RxLen - FCS_LEN)) {
if (pu8msa[u16index] == ITIM)
return &pu8msa[u16index];
@@ -313,8 +256,6 @@ static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)
return NULL;
}
-/* This function gets the current channel information from
- * the 802.11n beacon/probe response frame */
static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen)
{
u16 index;
@@ -323,27 +264,12 @@ static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen)
while (index < (u16RxLen - FCS_LEN)) {
if (pu8msa[index] == IDSPARMS)
return pu8msa[index + 2];
- /* Increment index by length information and header */
index += pu8msa[index + 1] + IE_HDR_LEN;
}
- /* Return current channel information from the MIB, if beacon/probe */
- /* response frame does not contain the DS parameter set IE */
- /* return (mget_CurrentChannel() + 1); */
- return 0; /* no MIB here */
+ return 0;
}
-/**
- * @brief parses the received 'N' message
- * @details
- * @param[in] pu8MsgBuffer The message to be parsed
- * @param[out] ppstrNetworkInfo pointer to pointer to the structure containing the parsed Network Info
- * @return Error code indicating success/failure
- * @note
- * @author mabubakr
- * @date 1 Mar 2012
- * @version 1.0
- */
s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
{
tstrNetworkInfo *pstrNetworkInfo = NULL;
@@ -357,28 +283,17 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
u8MsgType = pu8MsgBuffer[0];
- /* Check whether the received message type is 'N' */
if ('N' != u8MsgType) {
PRINT_ER("Received Message format incorrect.\n");
return -EFAULT;
}
- /* Extract message ID */
u8MsgID = pu8MsgBuffer[1];
-
- /* Extract message Length */
u16MsgLen = MAKE_WORD16(pu8MsgBuffer[2], pu8MsgBuffer[3]);
-
- /* Extract WID ID */
u16WidID = MAKE_WORD16(pu8MsgBuffer[4], pu8MsgBuffer[5]);
-
- /* Extract WID Length */
u16WidLen = MAKE_WORD16(pu8MsgBuffer[6], pu8MsgBuffer[7]);
-
- /* Assign a pointer to the WID value */
pu8WidVal = &pu8MsgBuffer[8];
- /* parse the WID value of the WID "WID_NEWORK_INFO" */
{
u8 *pu8msa = NULL;
u16 u16RxLen = 0;
@@ -395,46 +310,30 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
pstrNetworkInfo->s8rssi = pu8WidVal[0];
- /* Assign a pointer to msa "Mac Header Start Address" */
pu8msa = &pu8WidVal[1];
u16RxLen = u16WidLen - 1;
-
- /* parse msa*/
-
- /* Get the cap_info */
pstrNetworkInfo->u16CapInfo = get_cap_info(pu8msa);
- /* Get time-stamp [Low only 32 bit] */
pstrNetworkInfo->u32Tsf = get_beacon_timestamp_lo(pu8msa);
PRINT_D(CORECONFIG_DBG, "TSF :%x\n", pstrNetworkInfo->u32Tsf);
- /* Get full time-stamp [Low and High 64 bit] */
u32Tsf_Lo = get_beacon_timestamp_lo(pu8msa);
u32Tsf_Hi = get_beacon_timestamp_hi(pu8msa);
pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);
- /* Get SSID */
get_ssid(pu8msa, pstrNetworkInfo->au8ssid, &pstrNetworkInfo->u8SsidLen);
-
- /* Get BSSID */
get_BSSID(pu8msa, pstrNetworkInfo->au8bssid);
- /*
- * Extract current channel information from
- * the beacon/probe response frame
- */
pstrNetworkInfo->u8channel = get_current_channel_802_11n(pu8msa,
u16RxLen + FCS_LEN);
- /* Get beacon period */
u8index = MAC_HDR_LEN + TIME_STAMP_LEN;
pstrNetworkInfo->u16BeaconPeriod = get_beacon_period(pu8msa + u8index);
u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
- /* Get DTIM Period */
pu8TimElm = get_tim_elm(pu8msa, u16RxLen + FCS_LEN, u8index);
if (pu8TimElm)
pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3];
@@ -456,16 +355,6 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
return 0;
}
-/**
- * @brief Deallocates the parsed Network Info
- * @details
- * @param[in] pstrNetworkInfo Network Info to be deallocated
- * @return Error code indicating success/failure
- * @note
- * @author mabubakr
- * @date 1 Mar 2012
- * @version 1.0
- */
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
{
s32 s32Error = 0;
@@ -488,17 +377,6 @@ s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
return s32Error;
}
-/**
- * @brief parses the received Association Response frame
- * @details
- * @param[in] pu8Buffer The Association Response frame to be parsed
- * @param[out] ppstrConnectRespInfo pointer to pointer to the structure containing the parsed Association Response Info
- * @return Error code indicating success/failure
- * @note
- * @author mabubakr
- * @date 2 Apr 2012
- * @version 1.0
- */
s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo)
{
@@ -512,20 +390,13 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
if (!pstrConnectRespInfo)
return -ENOMEM;
- /* u16AssocRespLen = pu8Buffer[0]; */
u16AssocRespLen = (u16)u32BufferLen;
- /* get the status code */
pstrConnectRespInfo->u16ConnectStatus = get_asoc_status(pu8Buffer);
if (pstrConnectRespInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
-
- /* get the capability */
pstrConnectRespInfo->u16capability = get_assoc_resp_cap_info(pu8Buffer);
-
- /* get the Association ID */
pstrConnectRespInfo->u16AssocID = get_asoc_id(pu8Buffer);
- /* get the Information Elements */
pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
@@ -541,16 +412,6 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
return s32Error;
}
-/**
- * @brief Deallocates the parsed Association Response Info
- * @details
- * @param[in] pstrNetworkInfo Network Info to be deallocated
- * @return Error code indicating success/failure
- * @note
- * @author mabubakr
- * @date 2 Apr 2012
- * @version 1.0
- */
s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
{
s32 s32Error = 0;
--
1.9.1
This patch renames variable s32Error to result
to avoid CamelCase naming convention.
Also, remove the unused variable s32Error and replace with direct return.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 2a4e324..88e5661 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -356,30 +356,29 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
{
- s32 s32Error = 0;
+ s32 result = 0;
if (pstrNetworkInfo) {
if (pstrNetworkInfo->pu8IEs) {
kfree(pstrNetworkInfo->pu8IEs);
pstrNetworkInfo->pu8IEs = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
kfree(pstrNetworkInfo);
pstrNetworkInfo = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
- return s32Error;
+ return result;
}
s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo)
{
- s32 s32Error = 0;
tstrConnectRespInfo *pstrConnectRespInfo = NULL;
u16 u16AssocRespLen = 0;
u8 *pu8IEs = NULL;
@@ -408,27 +407,27 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
*ppstrConnectRespInfo = pstrConnectRespInfo;
- return s32Error;
+ return 0;
}
s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
{
- s32 s32Error = 0;
+ s32 result = 0;
if (pstrConnectRespInfo) {
if (pstrConnectRespInfo->pu8RespIEs) {
kfree(pstrConnectRespInfo->pu8RespIEs);
pstrConnectRespInfo->pu8RespIEs = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
kfree(pstrConnectRespInfo);
pstrConnectRespInfo = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
- return s32Error;
+ return result;
}
--
1.9.1
This patch renames u16index variable to index
to remove the prefix variable defined name.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index b769d3c..6f17e2b 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -243,14 +243,14 @@ static inline u16 get_asoc_id(u8 *data)
static u8 *get_tim_elm(u8 *pu8msa, u16 rx_len, u16 tag_param_offset)
{
- u16 u16index;
+ u16 index;
- u16index = tag_param_offset;
+ index = tag_param_offset;
- while (u16index < (rx_len - FCS_LEN)) {
- if (pu8msa[u16index] == ITIM)
- return &pu8msa[u16index];
- u16index += (IE_HDR_LEN + pu8msa[u16index + 1]);
+ while (index < (rx_len - FCS_LEN)) {
+ if (pu8msa[index] == ITIM)
+ return &pu8msa[index];
+ index += (IE_HDR_LEN + pu8msa[index + 1]);
}
return NULL;
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pu8MsgBuffer to msg_buffer
- ppstrNetworkInfo to ret_network_info
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 16 ++++++++--------
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 6f17e2b..43f0a29 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -270,7 +270,7 @@ static u8 get_current_channel_802_11n(u8 *pu8msa, u16 rx_len)
return 0;
}
-s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
+s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
{
tstrNetworkInfo *pstrNetworkInfo = NULL;
u8 u8MsgType = 0;
@@ -281,18 +281,18 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
u16 u16WidLen = 0;
u8 *pu8WidVal = NULL;
- u8MsgType = pu8MsgBuffer[0];
+ u8MsgType = msg_buffer[0];
if ('N' != u8MsgType) {
PRINT_ER("Received Message format incorrect.\n");
return -EFAULT;
}
- u8MsgID = pu8MsgBuffer[1];
- u16MsgLen = MAKE_WORD16(pu8MsgBuffer[2], pu8MsgBuffer[3]);
- u16WidID = MAKE_WORD16(pu8MsgBuffer[4], pu8MsgBuffer[5]);
- u16WidLen = MAKE_WORD16(pu8MsgBuffer[6], pu8MsgBuffer[7]);
- pu8WidVal = &pu8MsgBuffer[8];
+ u8MsgID = msg_buffer[1];
+ u16MsgLen = MAKE_WORD16(msg_buffer[2], msg_buffer[3]);
+ u16WidID = MAKE_WORD16(msg_buffer[4], msg_buffer[5]);
+ u16WidLen = MAKE_WORD16(msg_buffer[6], msg_buffer[7]);
+ pu8WidVal = &msg_buffer[8];
{
u8 *pu8msa = NULL;
@@ -350,7 +350,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
}
- *ppstrNetworkInfo = pstrNetworkInfo;
+ *ret_network_info = pstrNetworkInfo;
return 0;
}
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index ee107ac..aec0779 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -120,7 +120,7 @@ typedef struct {
size_t ie_len;
} tstrDisconnectNotifInfo;
-s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
+s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);
s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pstrNetworkInfo to network_info
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 14 +++++++-------
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index c78da2c..a0b80bf 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -354,20 +354,20 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
return 0;
}
-s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
+s32 wilc_dealloc_network_info(tstrNetworkInfo *network_info)
{
s32 result = 0;
- if (pstrNetworkInfo) {
- if (pstrNetworkInfo->pu8IEs) {
- kfree(pstrNetworkInfo->pu8IEs);
- pstrNetworkInfo->pu8IEs = NULL;
+ if (network_info) {
+ if (network_info->pu8IEs) {
+ kfree(network_info->pu8IEs);
+ network_info->pu8IEs = NULL;
} else {
result = -EFAULT;
}
- kfree(pstrNetworkInfo);
- pstrNetworkInfo = NULL;
+ kfree(network_info);
+ network_info = NULL;
} else {
result = -EFAULT;
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index ec810b5..d801e58 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -121,7 +121,7 @@ typedef struct {
} tstrDisconnectNotifInfo;
s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
-s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);
+s32 wilc_dealloc_network_info(tstrNetworkInfo *network_info);
s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
tstrConnectRespInfo **ret_connect_resp_info);
s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *connect_resp_info);
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pstrConnectRespInfo to connect_resp_info
- u16AssocRespLen to assoc_resp_len
- pu8IEs to ies
- u16IEsLen to ies_len
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 34 ++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 48c8573..c0be33d 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -379,33 +379,33 @@ s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
tstrConnectRespInfo **ret_connect_resp_info)
{
- tstrConnectRespInfo *pstrConnectRespInfo = NULL;
- u16 u16AssocRespLen = 0;
- u8 *pu8IEs = NULL;
- u16 u16IEsLen = 0;
+ tstrConnectRespInfo *connect_resp_info = NULL;
+ u16 assoc_resp_len = 0;
+ u8 *ies = NULL;
+ u16 ies_len = 0;
- pstrConnectRespInfo = kzalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
- if (!pstrConnectRespInfo)
+ connect_resp_info = kzalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
+ if (!connect_resp_info)
return -ENOMEM;
- u16AssocRespLen = (u16)buffer_len;
+ assoc_resp_len = (u16)buffer_len;
- pstrConnectRespInfo->u16ConnectStatus = get_asoc_status(buffer);
- if (pstrConnectRespInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
- pstrConnectRespInfo->u16capability = get_assoc_resp_cap_info(buffer);
- pstrConnectRespInfo->u16AssocID = get_asoc_id(buffer);
+ 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);
- pu8IEs = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
- u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
+ ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
+ ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
- pstrConnectRespInfo->pu8RespIEs = kmemdup(pu8IEs, u16IEsLen, GFP_KERNEL);
- if (!pstrConnectRespInfo->pu8RespIEs)
+ connect_resp_info->pu8RespIEs = kmemdup(ies, ies_len, GFP_KERNEL);
+ if (!connect_resp_info->pu8RespIEs)
return -ENOMEM;
- pstrConnectRespInfo->u16RespIEsLen = u16IEsLen;
+ connect_resp_info->u16RespIEsLen = ies_len;
}
- *ret_connect_resp_info = pstrConnectRespInfo;
+ *ret_connect_resp_info = connect_resp_info;
return 0;
}
--
1.9.1
Hi Leo,
On Thu, Jan 28, 2016 at 6:13 PM, Leo Kim <[email protected]> wrote:
> This patch renames variable s32Error to result
> to avoid CamelCase naming convention.
> Also, remove the unused variable s32Error and replace with direct return.
>
> Signed-off-by: Leo Kim <[email protected]>
> ---
> drivers/staging/wilc1000/coreconfigurator.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index 2a4e324..88e5661 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -356,30 +356,29 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
>
> s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
> {
> - s32 s32Error = 0;
> + s32 result = 0;
>
> if (pstrNetworkInfo) {
> if (pstrNetworkInfo->pu8IEs) {
> kfree(pstrNetworkInfo->pu8IEs);
> pstrNetworkInfo->pu8IEs = NULL;
I'm not sure it's necessary to set this to NULL here.
> } else {
> - s32Error = -EFAULT;
> + result = -EFAULT;
> }
>
> kfree(pstrNetworkInfo);
> pstrNetworkInfo = NULL;
Or this to NULL here.
Also, is the return value from this function actually checked? kfree()
can have NULL passed to it.
If the return value isn't checked, this entire function could be simplified to:
- - - - -
if (pstrNetworkInfo) {
kfree(pstrNetworkInfo->pu8IEs);
kfree(pstrNetworkInfo);
}
return 0;
- - - - -
Also, when tstrNetworkInfo structs are allocated, wouldn't the
allocating function fail if ->pu8IEs is NULL?
> } else {
> - s32Error = -EFAULT;
> + result = -EFAULT;
> }
>
> - return s32Error;
> + return result;
> }
>
> s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
> tstrConnectRespInfo **ppstrConnectRespInfo)
> {
> - s32 s32Error = 0;
> tstrConnectRespInfo *pstrConnectRespInfo = NULL;
> u16 u16AssocRespLen = 0;
> u8 *pu8IEs = NULL;
> @@ -408,27 +407,27 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
>
> *ppstrConnectRespInfo = pstrConnectRespInfo;
>
> - return s32Error;
> + return 0;
> }
>
> s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
> {
> - s32 s32Error = 0;
> + s32 result = 0;
All the comments above apply to this function as well.
>
> if (pstrConnectRespInfo) {
> if (pstrConnectRespInfo->pu8RespIEs) {
> kfree(pstrConnectRespInfo->pu8RespIEs);
> pstrConnectRespInfo->pu8RespIEs = NULL;
> } else {
> - s32Error = -EFAULT;
> + result = -EFAULT;
> }
>
> kfree(pstrConnectRespInfo);
> pstrConnectRespInfo = NULL;
>
> } else {
> - s32Error = -EFAULT;
> + result = -EFAULT;
> }
>
> - return s32Error;
> + return result;
> }
Thanks,
--
Julian Calaby
Email: [email protected]
Profile: http://www.google.com/profiles/julian.calaby/
Hi Leo,
On Fri, Jan 29, 2016 at 1:55 PM, Kim, Leo <[email protected]> wrote:
> Dear Julian
>
> Thank you in your advises.
> This patch subject is 'rename variables'.
> This time, I hope the patch is applied.
>
> I will be your positive advises change to next patch.
I should have been more clear, these were ideas for the next round of
changes, not changes you should make to this patch.
Thanks,
--
Julian Calaby
Email: [email protected]
Profile: http://www.google.com/profiles/julian.calaby/
This patch renames to avoid camelcase, changes follow are:
- pstrNetworkInfo to network_info
- u8MsgType to msg_type
- u8MsgID to msg_id
- u16MsgLen to msg_len
- u16WidID to wid_id
- u16WidLen to wid_len
- pu8WidVal to wid_val
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 67 ++++++++++++++---------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 43f0a29..24afeb8 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -272,27 +272,27 @@ static u8 get_current_channel_802_11n(u8 *pu8msa, u16 rx_len)
s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
{
- tstrNetworkInfo *pstrNetworkInfo = NULL;
- u8 u8MsgType = 0;
- u8 u8MsgID = 0;
- u16 u16MsgLen = 0;
+ tstrNetworkInfo *network_info = NULL;
+ u8 msg_type = 0;
+ u8 msg_id = 0;
+ u16 msg_len = 0;
- u16 u16WidID = (u16)WID_NIL;
- u16 u16WidLen = 0;
- u8 *pu8WidVal = NULL;
+ u16 wid_id = (u16)WID_NIL;
+ u16 wid_len = 0;
+ u8 *wid_val = NULL;
- u8MsgType = msg_buffer[0];
+ msg_type = msg_buffer[0];
- if ('N' != u8MsgType) {
+ if ('N' != msg_type) {
PRINT_ER("Received Message format incorrect.\n");
return -EFAULT;
}
- u8MsgID = msg_buffer[1];
- u16MsgLen = MAKE_WORD16(msg_buffer[2], msg_buffer[3]);
- u16WidID = MAKE_WORD16(msg_buffer[4], msg_buffer[5]);
- u16WidLen = MAKE_WORD16(msg_buffer[6], msg_buffer[7]);
- pu8WidVal = &msg_buffer[8];
+ msg_id = msg_buffer[1];
+ msg_len = MAKE_WORD16(msg_buffer[2], msg_buffer[3]);
+ wid_id = MAKE_WORD16(msg_buffer[4], msg_buffer[5]);
+ wid_len = MAKE_WORD16(msg_buffer[6], msg_buffer[7]);
+ wid_val = &msg_buffer[8];
{
u8 *pu8msa = NULL;
@@ -304,53 +304,52 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
u32 u32Tsf_Lo;
u32 u32Tsf_Hi;
- pstrNetworkInfo = kzalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
- if (!pstrNetworkInfo)
+ network_info = kzalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
+ if (!network_info)
return -ENOMEM;
- pstrNetworkInfo->s8rssi = pu8WidVal[0];
+ network_info->s8rssi = wid_val[0];
- pu8msa = &pu8WidVal[1];
+ pu8msa = &wid_val[1];
- rx_len = u16WidLen - 1;
- pstrNetworkInfo->u16CapInfo = get_cap_info(pu8msa);
- pstrNetworkInfo->u32Tsf = get_beacon_timestamp_lo(pu8msa);
- PRINT_D(CORECONFIG_DBG, "TSF :%x\n", pstrNetworkInfo->u32Tsf);
+ rx_len = wid_len - 1;
+ network_info->u16CapInfo = get_cap_info(pu8msa);
+ network_info->u32Tsf = get_beacon_timestamp_lo(pu8msa);
+ PRINT_D(CORECONFIG_DBG, "TSF :%x\n", network_info->u32Tsf);
u32Tsf_Lo = get_beacon_timestamp_lo(pu8msa);
u32Tsf_Hi = get_beacon_timestamp_hi(pu8msa);
- pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);
+ network_info->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);
- get_ssid(pu8msa, pstrNetworkInfo->au8ssid, &pstrNetworkInfo->u8SsidLen);
- get_BSSID(pu8msa, pstrNetworkInfo->au8bssid);
+ get_ssid(pu8msa, network_info->au8ssid, &network_info->u8SsidLen);
+ get_BSSID(pu8msa, network_info->au8bssid);
- pstrNetworkInfo->u8channel = get_current_channel_802_11n(pu8msa,
+ network_info->u8channel = get_current_channel_802_11n(pu8msa,
rx_len + FCS_LEN);
u8index = MAC_HDR_LEN + TIME_STAMP_LEN;
- pstrNetworkInfo->u16BeaconPeriod = get_beacon_period(pu8msa + u8index);
+ network_info->u16BeaconPeriod = get_beacon_period(pu8msa + u8index);
u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
pu8TimElm = get_tim_elm(pu8msa, rx_len + FCS_LEN, u8index);
if (pu8TimElm)
- pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3];
+ network_info->u8DtimPeriod = pu8TimElm[3];
pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN];
u16IEsLen = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
if (u16IEsLen > 0) {
- pstrNetworkInfo->pu8IEs = kmemdup(pu8IEs, u16IEsLen,
- GFP_KERNEL);
- if (!pstrNetworkInfo->pu8IEs)
+ network_info->pu8IEs = kmemdup(pu8IEs, u16IEsLen,
+ GFP_KERNEL);
+ if (!network_info->pu8IEs)
return -ENOMEM;
}
- pstrNetworkInfo->u16IEsLen = u16IEsLen;
-
+ network_info->u16IEsLen = u16IEsLen;
}
- *ret_network_info = pstrNetworkInfo;
+ *ret_network_info = network_info;
return 0;
}
--
1.9.1
RGVhciBKdWxpYW4NCg0KVGhhbmsgeW91IGluIHlvdXIgYWR2aXNlcy4NClRoaXMgcGF0Y2ggc3Vi
amVjdCBpcyAncmVuYW1lIHZhcmlhYmxlcycuDQpUaGlzIHRpbWUsIEkgaG9wZSB0aGUgcGF0Y2gg
aXMgYXBwbGllZC4NCg0KSSB3aWxsIGJlIHlvdXIgcG9zaXRpdmUgYWR2aXNlcyBjaGFuZ2UgdG8g
bmV4dCBwYXRjaC4NCg0KwqBUaGFua3MsIEJSDQrCoExlbw0KDQotLS0tLU9yaWdpbmFsIE1lc3Nh
Z2UtLS0tLQ0KRnJvbTogSnVsaWFuIENhbGFieSBbbWFpbHRvOmp1bGlhbi5jYWxhYnlAZ21haWwu
Y29tXSANClNlbnQ6IEZyaWRheSwgSmFudWFyeSAyOSwgMjAxNiA5OjU1IEFNDQpUbzogS2ltLCBM
ZW8gPExlby5LaW1AYXRtZWwuY29tPg0KQ2M6IEdyZWcgS0ggPGdyZWdraEBsaW51eGZvdW5kYXRp
b24ub3JnPjsgZGV2ZWxAZHJpdmVyZGV2Lm9zdW9zbC5vcmc7IGxpbnV4LXdpcmVsZXNzIDxsaW51
eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmc+OyBDaG8sIFRvbnkgPFRvbnkuQ2hvQGF0bWVsLmNv
bT47IExlZSwgR2xlbiA8R2xlbi5MZWVAYXRtZWwuY29tPjsgU2hpbiwgQXVzdGluIDxBdXN0aW4u
U2hpbkBhdG1lbC5jb20+OyBQYXJrLCBDaHJpcyA8Q2hyaXMuUGFya0BhdG1lbC5jb20+OyBBYm96
YWVpZCwgQWRoYW0gPEFkaGFtLkFib3phZWlkQGF0bWVsLmNvbT47IEZlcnJlLCBOaWNvbGFzIDxO
aWNvbGFzLkZFUlJFQGF0bWVsLmNvbT4NClN1YmplY3Q6IFJlOiBbUEFUQ0ggMDgvMTJdIHN0YWdp
bmc6IHdpbGMxMDAwOiByZW5hbWUgdmFyaWFibGUgczMyRXJyb3INCg0KSGkgTGVvLA0KDQpPbiBU
aHUsIEphbiAyOCwgMjAxNiBhdCA2OjEzIFBNLCBMZW8gS2ltIDxsZW8ua2ltQGF0bWVsLmNvbT4g
d3JvdGU6DQo+IFRoaXMgcGF0Y2ggcmVuYW1lcyB2YXJpYWJsZSBzMzJFcnJvciB0byByZXN1bHQg
dG8gYXZvaWQgQ2FtZWxDYXNlIA0KPiBuYW1pbmcgY29udmVudGlvbi4NCj4gQWxzbywgcmVtb3Zl
IHRoZSB1bnVzZWQgdmFyaWFibGUgczMyRXJyb3IgYW5kIHJlcGxhY2Ugd2l0aCBkaXJlY3QgcmV0
dXJuLg0KPg0KPiBTaWduZWQtb2ZmLWJ5OiBMZW8gS2ltIDxsZW8ua2ltQGF0bWVsLmNvbT4NCj4g
LS0tDQo+ICBkcml2ZXJzL3N0YWdpbmcvd2lsYzEwMDAvY29yZWNvbmZpZ3VyYXRvci5jIHwgMTkg
KysrKysrKysrLS0tLS0tLS0tLQ0KPiAgMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwg
MTAgZGVsZXRpb25zKC0pDQo+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvd2lsYzEw
MDAvY29yZWNvbmZpZ3VyYXRvci5jIA0KPiBiL2RyaXZlcnMvc3RhZ2luZy93aWxjMTAwMC9jb3Jl
Y29uZmlndXJhdG9yLmMNCj4gaW5kZXggMmE0ZTMyNC4uODhlNTY2MSAxMDA2NDQNCj4gLS0tIGEv
ZHJpdmVycy9zdGFnaW5nL3dpbGMxMDAwL2NvcmVjb25maWd1cmF0b3IuYw0KPiArKysgYi9kcml2
ZXJzL3N0YWdpbmcvd2lsYzEwMDAvY29yZWNvbmZpZ3VyYXRvci5jDQo+IEBAIC0zNTYsMzAgKzM1
NiwyOSBAQCBzMzIgd2lsY19wYXJzZV9uZXR3b3JrX2luZm8odTggKm1zZ19idWZmZXIsIA0KPiB0
c3RyTmV0d29ya0luZm8gKipyZXRfbmV0d29ya19pbmZvKQ0KPg0KPiAgczMyIHdpbGNfZGVhbGxv
Y19uZXR3b3JrX2luZm8odHN0ck5ldHdvcmtJbmZvICpwc3RyTmV0d29ya0luZm8pICB7DQo+IC0g
ICAgICAgczMyIHMzMkVycm9yID0gMDsNCj4gKyAgICAgICBzMzIgcmVzdWx0ID0gMDsNCj4NCj4g
ICAgICAgICBpZiAocHN0ck5ldHdvcmtJbmZvKSB7DQo+ICAgICAgICAgICAgICAgICBpZiAocHN0
ck5ldHdvcmtJbmZvLT5wdThJRXMpIHsNCj4gICAgICAgICAgICAgICAgICAgICAgICAga2ZyZWUo
cHN0ck5ldHdvcmtJbmZvLT5wdThJRXMpOw0KPiAgICAgICAgICAgICAgICAgICAgICAgICBwc3Ry
TmV0d29ya0luZm8tPnB1OElFcyA9IE5VTEw7DQoNCkknbSBub3Qgc3VyZSBpdCdzIG5lY2Vzc2Fy
eSB0byBzZXQgdGhpcyB0byBOVUxMIGhlcmUuDQoNCj4gICAgICAgICAgICAgICAgIH0gZWxzZSB7
DQo+IC0gICAgICAgICAgICAgICAgICAgICAgIHMzMkVycm9yID0gLUVGQVVMVDsNCj4gKyAgICAg
ICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gLUVGQVVMVDsNCj4gICAgICAgICAgICAgICAgIH0N
Cj4NCj4gICAgICAgICAgICAgICAgIGtmcmVlKHBzdHJOZXR3b3JrSW5mbyk7DQo+ICAgICAgICAg
ICAgICAgICBwc3RyTmV0d29ya0luZm8gPSBOVUxMOw0KDQpPciB0aGlzIHRvIE5VTEwgaGVyZS4N
Cg0KQWxzbywgaXMgdGhlIHJldHVybiB2YWx1ZSBmcm9tIHRoaXMgZnVuY3Rpb24gYWN0dWFsbHkg
Y2hlY2tlZD8ga2ZyZWUoKQ0KY2FuIGhhdmUgTlVMTCBwYXNzZWQgdG8gaXQuDQoNCklmIHRoZSBy
ZXR1cm4gdmFsdWUgaXNuJ3QgY2hlY2tlZCwgdGhpcyBlbnRpcmUgZnVuY3Rpb24gY291bGQgYmUg
c2ltcGxpZmllZCB0bzoNCg0KLSAtIC0gLSAtDQoNCmlmIChwc3RyTmV0d29ya0luZm8pIHsNCiAg
ICBrZnJlZShwc3RyTmV0d29ya0luZm8tPnB1OElFcyk7DQogICAga2ZyZWUocHN0ck5ldHdvcmtJ
bmZvKTsNCn0NCg0KcmV0dXJuIDA7DQoNCi0gLSAtIC0gLQ0KDQpBbHNvLCB3aGVuIHRzdHJOZXR3
b3JrSW5mbyBzdHJ1Y3RzIGFyZSBhbGxvY2F0ZWQsIHdvdWxkbid0IHRoZQ0KYWxsb2NhdGluZyBm
dW5jdGlvbiBmYWlsIGlmIC0+cHU4SUVzIGlzIE5VTEw/DQoNCj4gICAgICAgICB9IGVsc2Ugew0K
PiAtICAgICAgICAgICAgICAgczMyRXJyb3IgPSAtRUZBVUxUOw0KPiArICAgICAgICAgICAgICAg
cmVzdWx0ID0gLUVGQVVMVDsNCj4gICAgICAgICB9DQo+DQo+IC0gICAgICAgcmV0dXJuIHMzMkVy
cm9yOw0KPiArICAgICAgIHJldHVybiByZXN1bHQ7DQo+ICB9DQo+DQo+ICBzMzIgd2lsY19wYXJz
ZV9hc3NvY19yZXNwX2luZm8odTggKnB1OEJ1ZmZlciwgdTMyIHUzMkJ1ZmZlckxlbiwNCj4gICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRzdHJDb25uZWN0UmVzcEluZm8gKipwcHN0ckNv
bm5lY3RSZXNwSW5mbykNCj4gIHsNCj4gLSAgICAgICBzMzIgczMyRXJyb3IgPSAwOw0KPiAgICAg
ICAgIHRzdHJDb25uZWN0UmVzcEluZm8gKnBzdHJDb25uZWN0UmVzcEluZm8gPSBOVUxMOw0KPiAg
ICAgICAgIHUxNiB1MTZBc3NvY1Jlc3BMZW4gPSAwOw0KPiAgICAgICAgIHU4ICpwdThJRXMgPSBO
VUxMOw0KPiBAQCAtNDA4LDI3ICs0MDcsMjcgQEAgczMyIHdpbGNfcGFyc2VfYXNzb2NfcmVzcF9p
bmZvKHU4ICpwdThCdWZmZXIsIHUzMiB1MzJCdWZmZXJMZW4sDQo+DQo+ICAgICAgICAgKnBwc3Ry
Q29ubmVjdFJlc3BJbmZvID0gcHN0ckNvbm5lY3RSZXNwSW5mbzsNCj4NCj4gLSAgICAgICByZXR1
cm4gczMyRXJyb3I7DQo+ICsgICAgICAgcmV0dXJuIDA7DQo+ICB9DQo+DQo+ICBzMzIgd2lsY19k
ZWFsbG9jX2Fzc29jX3Jlc3BfaW5mbyh0c3RyQ29ubmVjdFJlc3BJbmZvICpwc3RyQ29ubmVjdFJl
c3BJbmZvKQ0KPiAgew0KPiAtICAgICAgIHMzMiBzMzJFcnJvciA9IDA7DQo+ICsgICAgICAgczMy
IHJlc3VsdCA9IDA7DQoNCkFsbCB0aGUgY29tbWVudHMgYWJvdmUgYXBwbHkgdG8gdGhpcyBmdW5j
dGlvbiBhcyB3ZWxsLg0KDQo+DQo+ICAgICAgICAgaWYgKHBzdHJDb25uZWN0UmVzcEluZm8pIHsN
Cj4gICAgICAgICAgICAgICAgIGlmIChwc3RyQ29ubmVjdFJlc3BJbmZvLT5wdThSZXNwSUVzKSB7
DQo+ICAgICAgICAgICAgICAgICAgICAgICAgIGtmcmVlKHBzdHJDb25uZWN0UmVzcEluZm8tPnB1
OFJlc3BJRXMpOw0KPiAgICAgICAgICAgICAgICAgICAgICAgICBwc3RyQ29ubmVjdFJlc3BJbmZv
LT5wdThSZXNwSUVzID0gTlVMTDsNCj4gICAgICAgICAgICAgICAgIH0gZWxzZSB7DQo+IC0gICAg
ICAgICAgICAgICAgICAgICAgIHMzMkVycm9yID0gLUVGQVVMVDsNCj4gKyAgICAgICAgICAgICAg
ICAgICAgICAgcmVzdWx0ID0gLUVGQVVMVDsNCj4gICAgICAgICAgICAgICAgIH0NCj4NCj4gICAg
ICAgICAgICAgICAgIGtmcmVlKHBzdHJDb25uZWN0UmVzcEluZm8pOw0KPiAgICAgICAgICAgICAg
ICAgcHN0ckNvbm5lY3RSZXNwSW5mbyA9IE5VTEw7DQo+DQo+ICAgICAgICAgfSBlbHNlIHsNCj4g
LSAgICAgICAgICAgICAgIHMzMkVycm9yID0gLUVGQVVMVDsNCj4gKyAgICAgICAgICAgICAgIHJl
c3VsdCA9IC1FRkFVTFQ7DQo+ICAgICAgICAgfQ0KPg0KPiAtICAgICAgIHJldHVybiBzMzJFcnJv
cjsNCj4gKyAgICAgICByZXR1cm4gcmVzdWx0Ow0KPiAgfQ0KDQpUaGFua3MsDQoNCi0tIA0KSnVs
aWFuIENhbGFieQ0KDQpFbWFpbDoganVsaWFuLmNhbGFieUBnbWFpbC5jb20NClByb2ZpbGU6IGh0
dHA6Ly93d3cuZ29vZ2xlLmNvbS9wcm9maWxlcy9qdWxpYW4uY2FsYWJ5Lw0K
This patch renames u16TagParamOffset variable to tag_param_offset
to avoid camelcase.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 9f85fff..b769d3c 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -241,11 +241,11 @@ static inline u16 get_asoc_id(u8 *data)
return asoc_id;
}
-static u8 *get_tim_elm(u8 *pu8msa, u16 rx_len, u16 u16TagParamOffset)
+static u8 *get_tim_elm(u8 *pu8msa, u16 rx_len, u16 tag_param_offset)
{
u16 u16index;
- u16index = u16TagParamOffset;
+ u16index = tag_param_offset;
while (u16index < (rx_len - FCS_LEN)) {
if (pu8msa[u16index] == ITIM)
--
1.9.1
This patch renames u16RxLen variable to rx_len to avoid camelcase.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 37d40bb..9f85fff 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -241,13 +241,13 @@ static inline u16 get_asoc_id(u8 *data)
return asoc_id;
}
-static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)
+static u8 *get_tim_elm(u8 *pu8msa, u16 rx_len, u16 u16TagParamOffset)
{
u16 u16index;
u16index = u16TagParamOffset;
- while (u16index < (u16RxLen - FCS_LEN)) {
+ while (u16index < (rx_len - FCS_LEN)) {
if (pu8msa[u16index] == ITIM)
return &pu8msa[u16index];
u16index += (IE_HDR_LEN + pu8msa[u16index + 1]);
@@ -256,12 +256,12 @@ static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)
return NULL;
}
-static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen)
+static u8 get_current_channel_802_11n(u8 *pu8msa, u16 rx_len)
{
u16 index;
index = TAG_PARAM_OFFSET;
- while (index < (u16RxLen - FCS_LEN)) {
+ while (index < (rx_len - FCS_LEN)) {
if (pu8msa[index] == IDSPARMS)
return pu8msa[index + 2];
index += pu8msa[index + 1] + IE_HDR_LEN;
@@ -296,7 +296,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
{
u8 *pu8msa = NULL;
- u16 u16RxLen = 0;
+ u16 rx_len = 0;
u8 *pu8TimElm = NULL;
u8 *pu8IEs = NULL;
u16 u16IEsLen = 0;
@@ -312,7 +312,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
pu8msa = &pu8WidVal[1];
- u16RxLen = u16WidLen - 1;
+ rx_len = u16WidLen - 1;
pstrNetworkInfo->u16CapInfo = get_cap_info(pu8msa);
pstrNetworkInfo->u32Tsf = get_beacon_timestamp_lo(pu8msa);
PRINT_D(CORECONFIG_DBG, "TSF :%x\n", pstrNetworkInfo->u32Tsf);
@@ -326,7 +326,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
get_BSSID(pu8msa, pstrNetworkInfo->au8bssid);
pstrNetworkInfo->u8channel = get_current_channel_802_11n(pu8msa,
- u16RxLen + FCS_LEN);
+ rx_len + FCS_LEN);
u8index = MAC_HDR_LEN + TIME_STAMP_LEN;
@@ -334,11 +334,11 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
- pu8TimElm = get_tim_elm(pu8msa, u16RxLen + FCS_LEN, u8index);
+ pu8TimElm = get_tim_elm(pu8msa, rx_len + FCS_LEN, u8index);
if (pu8TimElm)
pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3];
pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN];
- u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
+ u16IEsLen = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
if (u16IEsLen > 0) {
pstrNetworkInfo->pu8IEs = kmemdup(pu8IEs, u16IEsLen,
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pstrConnectRespInfo to connect_resp_info
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 14 +++++++-------
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index c0be33d..c78da2c 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -410,20 +410,20 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
return 0;
}
-s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
+s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *connect_resp_info)
{
s32 result = 0;
- if (pstrConnectRespInfo) {
- if (pstrConnectRespInfo->pu8RespIEs) {
- kfree(pstrConnectRespInfo->pu8RespIEs);
- pstrConnectRespInfo->pu8RespIEs = NULL;
+ if (connect_resp_info) {
+ if (connect_resp_info->pu8RespIEs) {
+ kfree(connect_resp_info->pu8RespIEs);
+ connect_resp_info->pu8RespIEs = NULL;
} else {
result = -EFAULT;
}
- kfree(pstrConnectRespInfo);
- pstrConnectRespInfo = NULL;
+ kfree(connect_resp_info);
+ connect_resp_info = NULL;
} else {
result = -EFAULT;
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 6a2c323..ec810b5 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -124,7 +124,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);
s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
tstrConnectRespInfo **ret_connect_resp_info);
-s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo);
+s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *connect_resp_info);
void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
u32 u32Length);
void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer,
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pu8Buffer to buffer
- u32BufferLen to buffer_len
- ppstrConnectRespInfo to ret_connect_resp_info
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 16 ++++++++--------
drivers/staging/wilc1000/coreconfigurator.h | 5 ++---
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 88e5661..48c8573 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -376,8 +376,8 @@ s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
return result;
}
-s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
- tstrConnectRespInfo **ppstrConnectRespInfo)
+s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
+ tstrConnectRespInfo **ret_connect_resp_info)
{
tstrConnectRespInfo *pstrConnectRespInfo = NULL;
u16 u16AssocRespLen = 0;
@@ -388,14 +388,14 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
if (!pstrConnectRespInfo)
return -ENOMEM;
- u16AssocRespLen = (u16)u32BufferLen;
+ u16AssocRespLen = (u16)buffer_len;
- pstrConnectRespInfo->u16ConnectStatus = get_asoc_status(pu8Buffer);
+ pstrConnectRespInfo->u16ConnectStatus = get_asoc_status(buffer);
if (pstrConnectRespInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
- pstrConnectRespInfo->u16capability = get_assoc_resp_cap_info(pu8Buffer);
- pstrConnectRespInfo->u16AssocID = get_asoc_id(pu8Buffer);
+ pstrConnectRespInfo->u16capability = get_assoc_resp_cap_info(buffer);
+ pstrConnectRespInfo->u16AssocID = get_asoc_id(buffer);
- pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
+ pu8IEs = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
pstrConnectRespInfo->pu8RespIEs = kmemdup(pu8IEs, u16IEsLen, GFP_KERNEL);
@@ -405,7 +405,7 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
pstrConnectRespInfo->u16RespIEsLen = u16IEsLen;
}
- *ppstrConnectRespInfo = pstrConnectRespInfo;
+ *ret_connect_resp_info = pstrConnectRespInfo;
return 0;
}
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index aec0779..6a2c323 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -122,9 +122,8 @@ typedef struct {
s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);
-
-s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
- tstrConnectRespInfo **ppstrConnectRespInfo);
+s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
+ tstrConnectRespInfo **ret_connect_resp_info);
s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo);
void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
u32 u32Length);
--
1.9.1
This patch renames to avoid camelcase, changes follow are:
- pu8TimElm to tim_elm
- pu8IEs to ies
- u16IEsLen to ies_len
- u32Tsf_Lo to tsf_lo
- u32Tsf_Hi to tsf_hi
And, remove the prefix variable defined name, below are:
- u8index to index
- pu8msa to msa
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 54 ++++++++++++++---------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 24afeb8..2a4e324 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -295,14 +295,14 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
wid_val = &msg_buffer[8];
{
- u8 *pu8msa = NULL;
+ u8 *msa = NULL;
u16 rx_len = 0;
- u8 *pu8TimElm = NULL;
- u8 *pu8IEs = NULL;
- u16 u16IEsLen = 0;
- u8 u8index = 0;
- u32 u32Tsf_Lo;
- u32 u32Tsf_Hi;
+ u8 *tim_elm = NULL;
+ u8 *ies = NULL;
+ u16 ies_len = 0;
+ u8 index = 0;
+ u32 tsf_lo;
+ u32 tsf_hi;
network_info = kzalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
if (!network_info)
@@ -310,43 +310,43 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
network_info->s8rssi = wid_val[0];
- pu8msa = &wid_val[1];
+ msa = &wid_val[1];
rx_len = wid_len - 1;
- network_info->u16CapInfo = get_cap_info(pu8msa);
- network_info->u32Tsf = get_beacon_timestamp_lo(pu8msa);
+ network_info->u16CapInfo = get_cap_info(msa);
+ network_info->u32Tsf = get_beacon_timestamp_lo(msa);
PRINT_D(CORECONFIG_DBG, "TSF :%x\n", network_info->u32Tsf);
- u32Tsf_Lo = get_beacon_timestamp_lo(pu8msa);
- u32Tsf_Hi = get_beacon_timestamp_hi(pu8msa);
+ tsf_lo = get_beacon_timestamp_lo(msa);
+ tsf_hi = get_beacon_timestamp_hi(msa);
- network_info->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);
+ network_info->u64Tsf = tsf_lo | ((u64)tsf_hi << 32);
- get_ssid(pu8msa, network_info->au8ssid, &network_info->u8SsidLen);
- get_BSSID(pu8msa, network_info->au8bssid);
+ get_ssid(msa, network_info->au8ssid, &network_info->u8SsidLen);
+ get_BSSID(msa, network_info->au8bssid);
- network_info->u8channel = get_current_channel_802_11n(pu8msa,
+ network_info->u8channel = get_current_channel_802_11n(msa,
rx_len + FCS_LEN);
- u8index = MAC_HDR_LEN + TIME_STAMP_LEN;
+ index = MAC_HDR_LEN + TIME_STAMP_LEN;
- network_info->u16BeaconPeriod = get_beacon_period(pu8msa + u8index);
+ network_info->u16BeaconPeriod = get_beacon_period(msa + index);
- u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
+ index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
- pu8TimElm = get_tim_elm(pu8msa, rx_len + FCS_LEN, u8index);
- if (pu8TimElm)
- network_info->u8DtimPeriod = pu8TimElm[3];
- pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN];
- u16IEsLen = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
+ tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index);
+ if (tim_elm)
+ network_info->u8DtimPeriod = tim_elm[3];
+ ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN];
+ ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
- if (u16IEsLen > 0) {
- network_info->pu8IEs = kmemdup(pu8IEs, u16IEsLen,
+ if (ies_len > 0) {
+ network_info->pu8IEs = kmemdup(ies, ies_len,
GFP_KERNEL);
if (!network_info->pu8IEs)
return -ENOMEM;
}
- network_info->u16IEsLen = u16IEsLen;
+ network_info->u16IEsLen = ies_len;
}
*ret_network_info = network_info;
--
1.9.1
On Thu, Jan 28, 2016 at 04:13:39PM +0900, Leo Kim wrote:
> This patch renames to avoid camelcase, changes follow are:
> - pu8MsgBuffer to msg_buffer
> - ppstrNetworkInfo to ret_network_info
>
> Signed-off-by: Leo Kim <[email protected]>
> ---
> drivers/staging/wilc1000/coreconfigurator.c | 16 ++++++++--------
> drivers/staging/wilc1000/coreconfigurator.h | 2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
This patch failed to apply, so please refresh it and the rest of this
series against my staging-testing branch and resend it.
thanks,
greg k-h