From: Chaehyun Lim Date: Thu, 3 Mar 2016 12:05:17 +0000 (+0900) Subject: staging: wilc1000: use TAG_PARAM_OFFSET define X-Git-Tag: v4.6-rc1~103^2~310 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7902451cb9f643b245d0e5cbb7ed8a703d9a980a;p=linux-block.git 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: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 25dc10878450..2c4ae1fc8435 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -178,10 +178,8 @@ static inline void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len) u8 i = 0; u8 j = 0; - len = data[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + - CAP_INFO_LEN + 1]; - j = MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + - CAP_INFO_LEN + 2; + len = data[TAG_PARAM_OFFSET + 1]; + j = TAG_PARAM_OFFSET + 2; if (len >= MAX_SSID_LEN) len = 0; @@ -335,10 +333,8 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index); if (tim_elm) network_info->dtim_period = 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); + ies = &msa[TAG_PARAM_OFFSET]; + ies_len = rx_len - TAG_PARAM_OFFSET; if (ies_len > 0) { network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);