Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80d2579d authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Fix DEEP_INDENTATION warning in rtllib_parse_info_param() 



Move MFIE_TYPE_GENERIC handler to rtllib_parse_mife_generic() function.
Code was not altered significantly, therefore in some places it generates
LONG_LINE checkpatch.pl warnings.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b57ceb19

drivers/staging/rtl8192e/rtllib_rx.c

+210 −187
Original line number Diff line number Diff line
@@ -1739,173 +1739,17 @@ static inline void rtllib_extract_country_ie( 


}



int rtllib_parse_info_param(struct rtllib_device *ieee,

static void rtllib_parse_mife_generic(struct rtllib_device *ieee,

				      struct rtllib_info_element *info_element,

		u16 length,

				      struct rtllib_network *network,

		struct rtllib_rx_stats *stats)

				      u16 *tmp_htcap_len,

				      u16 *tmp_htinfo_len)

{

	u8 i;

	short offset;

	u16	tmp_htcap_len = 0;

	u16	tmp_htinfo_len = 0;

	u16 ht_realtek_agg_len = 0;

	u8  ht_realtek_agg_buf[MAX_IE_LEN];

	char rates_str[64];

	char *p;



	while (length >= sizeof(*info_element)) {

		if (sizeof(*info_element) + info_element->len > length) {

			RTLLIB_DEBUG_MGMT("Info elem: parse failed: info_element->len + 2 > left : info_element->len+2=%zd left=%d, id=%d.\n",

					     info_element->len +

					     sizeof(*info_element),

					     length, info_element->id);

			/* We stop processing but don't return an error here

			 * because some misbehaviour APs break this rule. ie.

			 * Orinoco AP1000.

			 */

			break;

		}



		switch (info_element->id) {

		case MFIE_TYPE_SSID:

			if (rtllib_is_empty_essid(info_element->data,

						     info_element->len)) {

				network->flags |= NETWORK_EMPTY_ESSID;

				break;

			}



			network->ssid_len = min(info_element->len,

						(u8) IW_ESSID_MAX_SIZE);

			memcpy(network->ssid, info_element->data, network->ssid_len);

			if (network->ssid_len < IW_ESSID_MAX_SIZE)

				memset(network->ssid + network->ssid_len, 0,

				       IW_ESSID_MAX_SIZE - network->ssid_len);



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_SSID: '%s' len=%d.\n",

					     network->ssid, network->ssid_len);

			break;



		case MFIE_TYPE_RATES:

			p = rates_str;

			network->rates_len = min(info_element->len,

						 MAX_RATES_LENGTH);

			for (i = 0; i < network->rates_len; i++) {

				network->rates[i] = info_element->data[i];

				p += snprintf(p, sizeof(rates_str) -

					      (p - rates_str), "%02X ",

					      network->rates[i]);

				if (rtllib_is_ofdm_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_OFDM;

					if (info_element->data[i] &

					    RTLLIB_BASIC_RATE_MASK)

						network->flags &=

						    ~NETWORK_HAS_CCK;

				}



				if (rtllib_is_cck_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_CCK;

				}

			}



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_RATES: '%s' (%d)\n",

					     rates_str, network->rates_len);

			break;



		case MFIE_TYPE_RATES_EX:

			p = rates_str;

			network->rates_ex_len = min(info_element->len,

						    MAX_RATES_EX_LENGTH);

			for (i = 0; i < network->rates_ex_len; i++) {

				network->rates_ex[i] = info_element->data[i];

				p += snprintf(p, sizeof(rates_str) -

					      (p - rates_str), "%02X ",

					      network->rates_ex[i]);

				if (rtllib_is_ofdm_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_OFDM;

					if (info_element->data[i] &

					    RTLLIB_BASIC_RATE_MASK)

						network->flags &=

						    ~NETWORK_HAS_CCK;

				}

			}



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_RATES_EX: '%s' (%d)\n",

					     rates_str, network->rates_ex_len);

			break;



		case MFIE_TYPE_DS_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_DS_SET: %d\n",

					     info_element->data[0]);

			network->channel = info_element->data[0];

			break;



		case MFIE_TYPE_FH_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_FH_SET: ignored\n");

			break;



		case MFIE_TYPE_CF_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_CF_SET: ignored\n");

			break;



		case MFIE_TYPE_TIM:

			if (info_element->len < 4)

				break;



			network->tim.tim_count = info_element->data[0];

			network->tim.tim_period = info_element->data[1];



			network->dtim_period = info_element->data[1];

			if (ieee->state != RTLLIB_LINKED)

				break;

			network->last_dtim_sta_time = jiffies;



			network->dtim_data = RTLLIB_DTIM_VALID;





			if (info_element->data[2] & 1)

				network->dtim_data |= RTLLIB_DTIM_MBCAST;



			offset = (info_element->data[2] >> 1)*2;





			if (ieee->assoc_id < 8*offset ||

			    ieee->assoc_id > 8*(offset + info_element->len - 3))

				break;



			offset = (ieee->assoc_id / 8) - offset;

			if (info_element->data[3 + offset] &

			   (1 << (ieee->assoc_id % 8)))

				network->dtim_data |= RTLLIB_DTIM_UCAST;



			network->listen_interval = network->dtim_period;

			break;



		case MFIE_TYPE_ERP:

			network->erp_value = info_element->data[0];

			network->flags |= NETWORK_HAS_ERP_VALUE;

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_ERP_SET: %d\n",

					     network->erp_value);

			break;

		case MFIE_TYPE_IBSS_SET:

			network->atim_window = info_element->data[0];

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_IBSS_SET: %d\n",

					     network->atim_window);

			break;



		case MFIE_TYPE_CHALLENGE:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_CHALLENGE: ignored\n");

			break;



		case MFIE_TYPE_GENERIC:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_GENERIC: %d bytes\n",

					     info_element->len);

			if (!rtllib_parse_qos_info_param_IE(info_element,

							       network))

				break;

	if (!rtllib_parse_qos_info_param_IE(info_element, network))

		return;

	if (info_element->len >= 4 &&

	    info_element->data[0] == 0x00 &&

	    info_element->data[1] == 0x50 &&
@@ -1913,9 +1757,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
	    info_element->data[3] == 0x01) {

		network->wpa_ie_len = min(info_element->len + 2,

					  MAX_WPA_IE_LEN);

				memcpy(network->wpa_ie, info_element,

				       network->wpa_ie_len);

				break;

		memcpy(network->wpa_ie, info_element, network->wpa_ie_len);

		return;

	}

	if (info_element->len == 7 &&

	    info_element->data[0] == 0x00 &&
@@ -1925,21 +1768,24 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
	    info_element->data[4] == 0x02)

		network->Turbo_Enable = 1;



			if (tmp_htcap_len == 0) {

	if (*tmp_htcap_len == 0) {

		if (info_element->len >= 4 &&

		   info_element->data[0] == 0x00 &&

		   info_element->data[1] == 0x90 &&

		   info_element->data[2] == 0x4c &&

		   info_element->data[3] == 0x033) {



					tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);

					if (tmp_htcap_len != 0) {

			*tmp_htcap_len = min_t(u8, info_element->len,

					       MAX_IE_LEN);

			if (*tmp_htcap_len != 0) {

				network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;

						network->bssht.bdHTCapLen = min_t(u16, tmp_htcap_len, sizeof(network->bssht.bdHTCapBuf));

						memcpy(network->bssht.bdHTCapBuf, info_element->data, network->bssht.bdHTCapLen);

				network->bssht.bdHTCapLen = min_t(u16, *tmp_htcap_len, sizeof(network->bssht.bdHTCapBuf));

				memcpy(network->bssht.bdHTCapBuf,

				       info_element->data,

				       network->bssht.bdHTCapLen);

			}

		}

				if (tmp_htcap_len != 0) {

		if (*tmp_htcap_len != 0) {

			network->bssht.bdSupportHT = true;

			network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);

		} else {
@@ -1949,17 +1795,20 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
	}





			if (tmp_htinfo_len == 0) {

	if (*tmp_htinfo_len == 0) {

		if (info_element->len >= 4 &&

		    info_element->data[0] == 0x00 &&

		    info_element->data[1] == 0x90 &&

		    info_element->data[2] == 0x4c &&

		    info_element->data[3] == 0x034) {

					tmp_htinfo_len = min_t(u8, info_element->len, MAX_IE_LEN);

					if (tmp_htinfo_len != 0) {

			*tmp_htinfo_len = min_t(u8, info_element->len,

						MAX_IE_LEN);

			if (*tmp_htinfo_len != 0) {

				network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;

						network->bssht.bdHTInfoLen = min_t(u16, tmp_htinfo_len, sizeof(network->bssht.bdHTInfoBuf));

						memcpy(network->bssht.bdHTInfoBuf, info_element->data, network->bssht.bdHTInfoLen);

				network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len, sizeof(network->bssht.bdHTInfoBuf));

				memcpy(network->bssht.bdHTInfoBuf,

				       info_element->data,

				       network->bssht.bdHTInfoLen);

			}



		}
@@ -1972,17 +1821,23 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
			    info_element->data[1] == 0xe0 &&

			    info_element->data[2] == 0x4c &&

			    info_element->data[3] == 0x02) {

						ht_realtek_agg_len = min_t(u8, info_element->len, MAX_IE_LEN);

						memcpy(ht_realtek_agg_buf, info_element->data, info_element->len);

				ht_realtek_agg_len = min_t(u8,

							   info_element->len,

							   MAX_IE_LEN);

				memcpy(ht_realtek_agg_buf,

				       info_element->data,

				       info_element->len);

			}

			if (ht_realtek_agg_len >= 5) {

				network->realtek_cap_exit = true;

				network->bssht.bdRT2RTAggregation = true;



						if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & 0x02))

				if ((ht_realtek_agg_buf[4] == 1) &&

				    (ht_realtek_agg_buf[5] & 0x02))

					network->bssht.bdRT2RTLongSlotTime = true;



						if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))

				if ((ht_realtek_agg_buf[4] == 1) &&

				    (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))

					network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE;

			}

		}
@@ -2054,7 +1909,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
			if (network->MBssidMask != 0) {

				network->bMBssidValid = true;

				network->MBssidMask = 0xff << (network->MBssidMask);

						ether_addr_copy(network->MBssid, network->bssid);

				ether_addr_copy(network->MBssid,

						network->bssid);

				network->MBssid[5] &= network->MBssidMask;

			} else {

				network->bMBssidValid = false;
@@ -2088,6 +1944,173 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
		memcpy(network->wzc_ie, info_element,

		       network->wzc_ie_len);

	}

}



int rtllib_parse_info_param(struct rtllib_device *ieee,

		struct rtllib_info_element *info_element,

		u16 length,

		struct rtllib_network *network,

		struct rtllib_rx_stats *stats)

{

	u8 i;

	short offset;

	u16	tmp_htcap_len = 0;

	u16	tmp_htinfo_len = 0;

	char rates_str[64];

	char *p;



	while (length >= sizeof(*info_element)) {

		if (sizeof(*info_element) + info_element->len > length) {

			RTLLIB_DEBUG_MGMT("Info elem: parse failed: info_element->len + 2 > left : info_element->len+2=%zd left=%d, id=%d.\n",

					     info_element->len +

					     sizeof(*info_element),

					     length, info_element->id);

			/* We stop processing but don't return an error here

			 * because some misbehaviour APs break this rule. ie.

			 * Orinoco AP1000.

			 */

			break;

		}



		switch (info_element->id) {

		case MFIE_TYPE_SSID:

			if (rtllib_is_empty_essid(info_element->data,

						     info_element->len)) {

				network->flags |= NETWORK_EMPTY_ESSID;

				break;

			}



			network->ssid_len = min(info_element->len,

						(u8) IW_ESSID_MAX_SIZE);

			memcpy(network->ssid, info_element->data, network->ssid_len);

			if (network->ssid_len < IW_ESSID_MAX_SIZE)

				memset(network->ssid + network->ssid_len, 0,

				       IW_ESSID_MAX_SIZE - network->ssid_len);



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_SSID: '%s' len=%d.\n",

					     network->ssid, network->ssid_len);

			break;



		case MFIE_TYPE_RATES:

			p = rates_str;

			network->rates_len = min(info_element->len,

						 MAX_RATES_LENGTH);

			for (i = 0; i < network->rates_len; i++) {

				network->rates[i] = info_element->data[i];

				p += snprintf(p, sizeof(rates_str) -

					      (p - rates_str), "%02X ",

					      network->rates[i]);

				if (rtllib_is_ofdm_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_OFDM;

					if (info_element->data[i] &

					    RTLLIB_BASIC_RATE_MASK)

						network->flags &=

						    ~NETWORK_HAS_CCK;

				}



				if (rtllib_is_cck_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_CCK;

				}

			}



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_RATES: '%s' (%d)\n",

					     rates_str, network->rates_len);

			break;



		case MFIE_TYPE_RATES_EX:

			p = rates_str;

			network->rates_ex_len = min(info_element->len,

						    MAX_RATES_EX_LENGTH);

			for (i = 0; i < network->rates_ex_len; i++) {

				network->rates_ex[i] = info_element->data[i];

				p += snprintf(p, sizeof(rates_str) -

					      (p - rates_str), "%02X ",

					      network->rates_ex[i]);

				if (rtllib_is_ofdm_rate

				    (info_element->data[i])) {

					network->flags |= NETWORK_HAS_OFDM;

					if (info_element->data[i] &

					    RTLLIB_BASIC_RATE_MASK)

						network->flags &=

						    ~NETWORK_HAS_CCK;

				}

			}



			RTLLIB_DEBUG_MGMT("MFIE_TYPE_RATES_EX: '%s' (%d)\n",

					     rates_str, network->rates_ex_len);

			break;



		case MFIE_TYPE_DS_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_DS_SET: %d\n",

					     info_element->data[0]);

			network->channel = info_element->data[0];

			break;



		case MFIE_TYPE_FH_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_FH_SET: ignored\n");

			break;



		case MFIE_TYPE_CF_SET:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_CF_SET: ignored\n");

			break;



		case MFIE_TYPE_TIM:

			if (info_element->len < 4)

				break;



			network->tim.tim_count = info_element->data[0];

			network->tim.tim_period = info_element->data[1];



			network->dtim_period = info_element->data[1];

			if (ieee->state != RTLLIB_LINKED)

				break;

			network->last_dtim_sta_time = jiffies;



			network->dtim_data = RTLLIB_DTIM_VALID;





			if (info_element->data[2] & 1)

				network->dtim_data |= RTLLIB_DTIM_MBCAST;



			offset = (info_element->data[2] >> 1)*2;





			if (ieee->assoc_id < 8*offset ||

			    ieee->assoc_id > 8*(offset + info_element->len - 3))

				break;



			offset = (ieee->assoc_id / 8) - offset;

			if (info_element->data[3 + offset] &

			   (1 << (ieee->assoc_id % 8)))

				network->dtim_data |= RTLLIB_DTIM_UCAST;



			network->listen_interval = network->dtim_period;

			break;



		case MFIE_TYPE_ERP:

			network->erp_value = info_element->data[0];

			network->flags |= NETWORK_HAS_ERP_VALUE;

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_ERP_SET: %d\n",

					     network->erp_value);

			break;

		case MFIE_TYPE_IBSS_SET:

			network->atim_window = info_element->data[0];

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_IBSS_SET: %d\n",

					     network->atim_window);

			break;



		case MFIE_TYPE_CHALLENGE:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_CHALLENGE: ignored\n");

			break;



		case MFIE_TYPE_GENERIC:

			RTLLIB_DEBUG_MGMT("MFIE_TYPE_GENERIC: %d bytes\n",

					     info_element->len);

			rtllib_parse_mife_generic(ieee, info_element, network,

						  &tmp_htcap_len,

						  &tmp_htinfo_len);

			break;



		case MFIE_TYPE_RSN: