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;
                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);