Commit 7902451c authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: use TAG_PARAM_OFFSET define

TAG_PARAM_OFFSET is defined at top of this file so that it is used
to simplify codes.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63f80351
...@@ -178,10 +178,8 @@ static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len) ...@@ -178,10 +178,8 @@ static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len)
u8 i = 0; u8 i = 0;
u8 j = 0; u8 j = 0;
len = data[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + len = data[TAG_PARAM_OFFSET + 1];
CAP_INFO_LEN + 1]; j = TAG_PARAM_OFFSET + 2;
j = MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN +
CAP_INFO_LEN + 2;
if (len >= MAX_SSID_LEN) if (len >= MAX_SSID_LEN)
len = 0; len = 0;
...@@ -335,10 +333,8 @@ s32 wilc_parse_network_info(u8 *msg_buffer, ...@@ -335,10 +333,8 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index); tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index);
if (tim_elm) if (tim_elm)
network_info->dtim_period = tim_elm[3]; network_info->dtim_period = tim_elm[3];
ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + ies = &msa[TAG_PARAM_OFFSET];
CAP_INFO_LEN]; ies_len = rx_len - TAG_PARAM_OFFSET;
ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN +
BEACON_INTERVAL_LEN + CAP_INFO_LEN);
if (ies_len > 0) { if (ies_len > 0) {
network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL); network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment