staging: rtl8723bs: fix camel case in struct wlan_bssid_ex (d3fcee1b) · Commits · jan.koester / Linux

drivers/staging/rtl8723bs/core/rtw_ap.c

+62 −62

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ static void update_BCNTIM(struct adapter *padapter)
		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
		struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
		struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;
		unsigned char *pie = pnetwork_mlmeext->IEs;
		unsigned char *pie = pnetwork_mlmeext->ies;

		/* update TIM IE */
		u8 p, dst_ie, premainder_ie = NULL, pbackup_remainder_ie = NULL;
		@@ -68,7 +68,7 @@ static void update_BCNTIM(struct adapter *padapter)
		p = rtw_get_ie(pie + _FIXED_IE_LENGTH_,
		WLAN_EID_TIM,
		&tim_ielen,
		pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_
		pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_
		);
		if (p && tim_ielen > 0) {
		tim_ielen += 2;
		@@ -77,7 +77,7 @@ static void update_BCNTIM(struct adapter *padapter)

		tim_ie_offset = (signed int)(p - pie);

		remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen;
		remainder_ielen = pnetwork_mlmeext->ie_length - tim_ie_offset - tim_ielen;

		/* append TIM IE from dst_ie offset */
		dst_ie = p;
		@@ -91,7 +91,7 @@ static void update_BCNTIM(struct adapter *padapter)
		p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
		WLAN_EID_SSID,
		&tmp_len,
		(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
		(pnetwork_mlmeext->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p)
		offset += tmp_len + 2;
		@@ -99,7 +99,7 @@ static void update_BCNTIM(struct adapter *padapter)
		/* get supported rates len */
		p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
		WLAN_EID_SUPP_RATES, &tmp_len,
		(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
		(pnetwork_mlmeext->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p)
		offset += tmp_len + 2;
		@@ -109,7 +109,7 @@ static void update_BCNTIM(struct adapter *padapter)

		premainder_ie = pie + offset;

		remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
		remainder_ielen = pnetwork_mlmeext->ie_length - offset - tim_ielen;

		/* append TIM IE from offset */
		dst_ie = pie + offset;
		@@ -161,7 +161,7 @@ static void update_BCNTIM(struct adapter *padapter)
		}

		offset = (uint)(dst_ie - pie);
		pnetwork_mlmeext->IELength = offset + remainder_ielen;
		pnetwork_mlmeext->ie_length = offset + remainder_ielen;
		}

		static u8 chk_sta_is_alive(struct sta_info *psta)
		@@ -340,7 +340,7 @@ void add_RATid(struct adapter padapter, struct sta_info psta, u8 rssi_level)

		shortGIrate = query_ra_short_GI(psta);

		if (pcur_network->Configuration.DSConfig > 14) {
		if (pcur_network->configuration.DSConfig > 14) {
		sta_band \|= WIRELESS_INVALID;
		} else {
		if (tx_ra_bitmap & 0xffff000)
		@@ -397,16 +397,16 @@ void update_bmc_sta(struct adapter *padapter)
		/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */

		/* prepare for add_RATid */
		supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->SupportedRates);
		network_type = rtw_check_network_type((u8 *)&pcur_network->SupportedRates,
		supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->supported_rates);
		network_type = rtw_check_network_type((u8 *)&pcur_network->supported_rates,
		supportRateNum,
		pcur_network->Configuration.DSConfig
		pcur_network->configuration.DSConfig
		);
		if (is_supported_tx_cck(network_type)) {
		network_type = WIRELESS_11B;
		} else if (network_type == WIRELESS_INVALID) { /* error handling */

		if (pcur_network->Configuration.DSConfig > 14)
		if (pcur_network->configuration.DSConfig > 14)
		network_type = WIRELESS_INVALID;
		else
		network_type = WIRELESS_11B;
		@@ -572,8 +572,8 @@ static void update_ap_info(struct adapter padapter, struct sta_info psta)

		psta->wireless_mode = pmlmeext->cur_wireless_mode;

		psta->bssratelen = rtw_get_rateset_len(pnetwork->SupportedRates);
		memcpy(psta->bssrateset, pnetwork->SupportedRates, psta->bssratelen);
		psta->bssratelen = rtw_get_rateset_len(pnetwork->supported_rates);
		memcpy(psta->bssrateset, pnetwork->supported_rates, psta->bssratelen);

		/* HT related cap */
		if (phtpriv_ap->ht_option) {
		@@ -656,16 +656,16 @@ void start_bss_network(struct adapter *padapter)
		struct HT_info_element *pht_info = NULL;
		u8 cbw40_enable = 0;

		bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
		cur_channel = pnetwork->Configuration.DSConfig;
		bcn_interval = (u16)pnetwork->configuration.BeaconPeriod;
		cur_channel = pnetwork->configuration.DSConfig;
		cur_bwmode = CHANNEL_WIDTH_20;
		cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;

		/* check if there is wps ie, */
		/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */
		/* and at first time the security ie (RSN/WPA IE) will not include in beacon. */
		if (!rtw_get_wps_ie(pnetwork->IEs + _FIXED_IE_LENGTH_,
		pnetwork->IELength - _FIXED_IE_LENGTH_, NULL, NULL))
		if (!rtw_get_wps_ie(pnetwork->ies + _FIXED_IE_LENGTH_,
		pnetwork->ie_length - _FIXED_IE_LENGTH_, NULL, NULL))
		pmlmeext->bstart_bss = true;

		/* todo: update wmm, ht cap */
		@@ -694,7 +694,7 @@ void start_bss_network(struct adapter *padapter)
		Set_MSR(padapter, _HW_STATE_AP_);

		/* Set BSSID REG */
		rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pnetwork->MacAddress);
		rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pnetwork->mac_address);

		/* Set EDCA param reg */
		acparm = 0x002F3217; /* VO */
		@@ -734,10 +734,10 @@ void start_bss_network(struct adapter *padapter)
		}

		/* set channel, bwmode */
		p = rtw_get_ie((pnetwork->IEs + sizeof(struct ndis_802_11_fix_ie)),
		p = rtw_get_ie((pnetwork->ies + sizeof(struct ndis_802_11_fix_ie)),
		WLAN_EID_HT_OPERATION,
		&ie_len,
		(pnetwork->IELength - sizeof(struct ndis_802_11_fix_ie))
		(pnetwork->ie_length - sizeof(struct ndis_802_11_fix_ie))
		);
		if (p && ie_len) {
		pht_info = (struct HT_info_element *)(p + 2);
		@@ -780,14 +780,14 @@ void start_bss_network(struct adapter *padapter)
		pmlmeext->cur_wireless_mode = pmlmepriv->cur_network.network_type;

		/* let pnetwork_mlmeext == pnetwork_mlme. */
		memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
		memcpy(pnetwork_mlmeext, pnetwork, pnetwork->length);

		/* update cur_wireless_mode */
		update_wireless_mode(padapter);

		/* update RRSR after set channel and bandwidth */
		UpdateBrateTbl(padapter, pnetwork->SupportedRates);
		rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates);
		UpdateBrateTbl(padapter, pnetwork->supported_rates);
		rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->supported_rates);

		/* update capability after cur_wireless_mode updated */
		update_capinfo(
		@@ -827,7 +827,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
		struct wlan_bssid_ex
		pbss_network = (struct wlan_bssid_ex )&pmlmepriv->cur_network.network;
		u8 *ie = pbss_network->IEs;
		u8 *ie = pbss_network->ies;

		if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))
		return _FAIL;
		@@ -835,23 +835,23 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		if (len < 0 \|\| len > MAX_IE_SZ)
		return _FAIL;

		pbss_network->IELength = len;
		pbss_network->ie_length = len;

		memset(ie, 0, MAX_IE_SZ);

		memcpy(ie, pbuf, pbss_network->IELength);
		memcpy(ie, pbuf, pbss_network->ie_length);

		if (pbss_network->InfrastructureMode != Ndis802_11APMode)
		if (pbss_network->infrastructure_mode != Ndis802_11APMode)
		return _FAIL;

		pbss_network->Rssi = 0;
		pbss_network->rssi = 0;

		memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN);
		memcpy(pbss_network->mac_address, myid(&(padapter->eeprompriv)), ETH_ALEN);

		/* beacon interval */
		p = rtw_get_beacon_interval_from_ie(ie);/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */
		/* pbss_network->Configuration.BeaconPeriod = le16_to_cpu((unsigned short)p); */
		pbss_network->Configuration.BeaconPeriod = get_unaligned_le16(p);
		/* pbss_network->configuration.BeaconPeriod = le16_to_cpu((unsigned short)p); */
		pbss_network->configuration.BeaconPeriod = get_unaligned_le16(p);

		/* capability */
		/* cap = (unsigned short )rtw_get_capability_from_ie(ie); */
		@@ -863,26 +863,26 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_SSID,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0) {
		memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
		memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
		pbss_network->Ssid.SsidLength = ie_len;
		memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid));
		memcpy(pbss_network->ssid.Ssid, (p + 2), ie_len);
		pbss_network->ssid.SsidLength = ie_len;
		}

		/* channel */
		channel = 0;
		pbss_network->Configuration.Length = 0;
		pbss_network->configuration.Length = 0;
		p = rtw_get_ie(
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_DS_PARAMS, &ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0)
		channel = *(p + 2);

		pbss_network->Configuration.DSConfig = channel;
		pbss_network->configuration.DSConfig = channel;

		memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);
		/* get supported rates */
		@@ -890,7 +890,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_SUPP_RATES,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p != NULL) {
		memcpy(supportRate, p + 2, ie_len);
		@@ -902,7 +902,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_EXT_SUPP_RATES,
		&ie_len,
		pbss_network->IELength - _BEACON_IE_OFFSET_
		pbss_network->ie_length - _BEACON_IE_OFFSET_
		);
		if (p != NULL) {
		memcpy(supportRate + supportRateNum, p + 2, ie_len);
		@@ -911,23 +911,23 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)

		network_type = rtw_check_network_type(supportRate, supportRateNum, channel);

		rtw_set_supported_rate(pbss_network->SupportedRates, network_type);
		rtw_set_supported_rate(pbss_network->supported_rates, network_type);

		/* parsing ERP_IE */
		p = rtw_get_ie(
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_ERP_INFO,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0)
		ERP_IE_handler(padapter, (struct ndis_80211_var_ie *)p);

		/* update privacy/security */
		if (cap & BIT(4))
		pbss_network->Privacy = 1;
		pbss_network->privacy = 1;
		else
		pbss_network->Privacy = 0;
		pbss_network->privacy = 0;

		psecuritypriv->wpa_psk = 0;

		@@ -939,7 +939,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_RSN,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0) {
		if (rtw_parse_wpa2_ie(
		@@ -969,7 +969,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		p,
		WLAN_EID_VENDOR_SPECIFIC,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))
		(pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2))
		);
		if ((p) && (!memcmp(p + 2, OUI1, 4))) {
		if (rtw_parse_wpa_ie(
		@@ -1005,7 +1005,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		p,
		WLAN_EID_VENDOR_SPECIFIC,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))
		(pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2))
		);
		if ((p) && !memcmp(p + 2, WMM_PARA_IE, 6)) {
		pmlmepriv->qospriv.qos_option = 1;
		@@ -1032,7 +1032,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_HT_CAPABILITY,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0) {
		u8 rf_type = 0;
		@@ -1095,23 +1095,23 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_HT_OPERATION,
		&ie_len,
		(pbss_network->IELength - _BEACON_IE_OFFSET_)
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && ie_len > 0)
		pHT_info_ie = p;

		switch (network_type) {
		case WIRELESS_11B:
		pbss_network->NetworkTypeInUse = Ndis802_11DS;
		pbss_network->network_type_in_use = Ndis802_11DS;
		break;
		case WIRELESS_11G:
		case WIRELESS_11BG:
		case WIRELESS_11G_24N:
		case WIRELESS_11BG_24N:
		pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
		pbss_network->network_type_in_use = Ndis802_11OFDM24;
		break;
		default:
		pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
		pbss_network->network_type_in_use = Ndis802_11OFDM24;
		break;
		}

		@@ -1138,7 +1138,7 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		HT_info_handler(padapter, (struct ndis_80211_var_ie *)pHT_info_ie);
		}

		pbss_network->Length = get_wlan_bssid_ex_sz(
		pbss_network->length = get_wlan_bssid_ex_sz(
		(struct wlan_bssid_ex *)pbss_network
		);

		@@ -1147,9 +1147,9 @@ int rtw_check_beacon_data(struct adapter padapter, u8 pbuf, int len)
		rtw_startbss_cmd(padapter, RTW_CMDF_WAIT_ACK);

		/* alloc sta_info for ap itself */
		psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->MacAddress);
		psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->mac_address);
		if (!psta) {
		psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->MacAddress);
		psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->mac_address);
		if (psta == NULL)
		return _FAIL;
		}
		@@ -1405,7 +1405,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
		struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
		struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
		struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
		unsigned char p, ie = pnetwork->IEs;
		unsigned char p, ie = pnetwork->ies;
		u32 len = 0;

		if (!pmlmeinfo->ERP_enable)
		@@ -1416,7 +1416,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
		ie + _BEACON_IE_OFFSET_,
		WLAN_EID_ERP_INFO,
		&len,
		(pnetwork->IELength - _BEACON_IE_OFFSET_)
		(pnetwork->ie_length - _BEACON_IE_OFFSET_)
		);
		if (p && len > 0) {
		struct ndis_80211_var_ie pIE = (struct ndis_80211_var_ie )p;
		@@ -1469,8 +1469,8 @@ static void update_bcn_wps_ie(struct adapter *padapter)
		struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
		struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
		struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
		unsigned char *ie = pnetwork->IEs;
		u32 ielen = pnetwork->IELength;
		unsigned char *ie = pnetwork->ies;
		u32 ielen = pnetwork->ie_length;

		pwps_ie = rtw_get_wps_ie(
		ie + _FIXED_IE_LENGTH_,
		@@ -1506,8 +1506,8 @@ static void update_bcn_wps_ie(struct adapter *padapter)
		if (pbackup_remainder_ie)
		memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);

		/* update IELength */
		pnetwork->IELength = wps_offset + (wps_ielen + 2) + remainder_ielen;
		/* update ie_length */
		pnetwork->ie_length = wps_offset + (wps_ielen + 2) + remainder_ielen;
		}

		kfree(pbackup_remainder_ie);

drivers/staging/rtl8723bs/core/rtw_cmd.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -656,7 +656,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
		pcmd->rsp = NULL;
		pcmd->rspsz = 0;

		pdev_network->Length = pcmd->cmdsz;
		pdev_network->length = pcmd->cmdsz;

		res = rtw_enqueue_cmd(pcmdpriv, pcmd);

		@@ -722,7 +722,7 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)
		struct security_priv *psecuritypriv = &padapter->securitypriv;
		struct registry_priv *pregistrypriv = &padapter->registrypriv;
		struct ht_priv *phtpriv = &pmlmepriv->htpriv;
		enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.InfrastructureMode;
		enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.infrastructure_mode;
		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
		struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
		u32 tmp_len;
		@@ -733,7 +733,7 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)
		res = _FAIL;
		goto exit;
		}
		/* for IEs is fix buf size */
		/* for ies is fix buf size */
		t_len = sizeof(struct wlan_bssid_ex);


		@@ -762,32 +762,32 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)

		memcpy(psecnetwork, &pnetwork->network, get_wlan_bssid_ex_sz(&pnetwork->network));

		psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->IELength;
		psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->ie_length;

		if ((psecnetwork->IELength-12) < (256-1))
		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
		if ((psecnetwork->ie_length-12) < (256-1))
		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], psecnetwork->ie_length-12);
		else
		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], (256-1));

		psecnetwork->IELength = 0;
		psecnetwork->ie_length = 0;
		/* Added by Albert 2009/02/18 */
		/* If the driver wants to use the bssid to create the connection. */
		/* If not, we have to copy the connecting AP's MAC address to it so that */
		/* the driver just has the bssid information for PMKIDList searching. */

		if (pmlmepriv->assoc_by_bssid == false)
		memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.MacAddress[0], ETH_ALEN);
		memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.mac_address[0], ETH_ALEN);

		psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength);
		psecnetwork->ie_length = rtw_restruct_sec_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length);


		pqospriv->qos_option = 0;

		if (pregistrypriv->wmm_enable) {
		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength);
		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length, psecnetwork->ie_length);

		if (psecnetwork->IELength != tmp_len) {
		psecnetwork->IELength = tmp_len;
		if (psecnetwork->ie_length != tmp_len) {
		psecnetwork->ie_length = tmp_len;
		pqospriv->qos_option = 1; /* There is WMM IE in this corresp. beacon */
		} else {
		pqospriv->qos_option = 0;/* There is no WMM IE in this corresp. beacon */
		@@ -795,7 +795,7 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)
		}

		phtpriv->ht_option = false;
		ptmp = rtw_get_ie(&pnetwork->network.IEs[12], WLAN_EID_HT_CAPABILITY, &tmp_len, pnetwork->network.IELength-12);
		ptmp = rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &tmp_len, pnetwork->network.ie_length-12);
		if (pregistrypriv->ht_enable && ptmp && tmp_len > 0) {
		/* Added by Albert 2010/06/23 */
		/* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */
		@@ -805,18 +805,18 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)
		(padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {
		rtw_ht_use_default_setting(padapter);

		rtw_build_wmm_ie_ht(padapter, &psecnetwork->IEs[12], &psecnetwork->IELength);
		rtw_build_wmm_ie_ht(padapter, &psecnetwork->ies[12], &psecnetwork->ie_length);

		/* rtw_restructure_ht_ie */
		rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[12], &psecnetwork->IEs[0],
		pnetwork->network.IELength-12, &psecnetwork->IELength,
		pnetwork->network.Configuration.DSConfig);
		rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[12], &psecnetwork->ies[0],
		pnetwork->network.ie_length-12, &psecnetwork->ie_length,
		pnetwork->network.configuration.DSConfig);
		}
		}

		rtw_append_exented_cap(padapter, &psecnetwork->IEs[0], &psecnetwork->IELength);
		rtw_append_exented_cap(padapter, &psecnetwork->ies[0], &psecnetwork->ie_length);

		pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength);
		pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.ies, pnetwork->network.ie_length);

		pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */

		@@ -1973,9 +1973,9 @@ void rtw_createbss_cmd_callback(struct adapter padapter, struct cmd_obj pcmd)


		if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
		psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress);
		psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->mac_address);
		if (!psta) {
		psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);
		psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->mac_address);
		if (!psta)
		goto createbss_cmd_fail;
		}
		@@ -1995,8 +1995,8 @@ void rtw_createbss_cmd_callback(struct adapter padapter, struct cmd_obj pcmd)
		list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
		}

		pnetwork->Length = get_wlan_bssid_ex_sz(pnetwork);
		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
		pnetwork->length = get_wlan_bssid_ex_sz(pnetwork);
		memcpy(&(pwlan->network), pnetwork, pnetwork->length);
		/* pwlan->fixed = true; */

		/* list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); */
		@@ -2005,7 +2005,7 @@ void rtw_createbss_cmd_callback(struct adapter padapter, struct cmd_obj pcmd)
		memcpy(&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz(pnetwork)));

		/* reset DSConfig */
		/* tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig); */
		/* tgt_network->network.configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->configuration.DSConfig); */

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+26 −26

Original line number	Diff line number	Diff line
		@@ -253,25 +253,25 @@ int rtw_ies_remove_ie(u8 ies, uint ies_len, uint offset, u8 eid, u8 *oui, u8 o
		return ret;
		}

		void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
		void rtw_set_supported_rate(u8 *supported_rates, uint mode)
		{
		memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);
		memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);

		switch (mode) {
		case WIRELESS_11B:
		memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
		memcpy(supported_rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
		break;

		case WIRELESS_11G:
		memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
		memcpy(supported_rates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
		break;

		case WIRELESS_11BG:
		case WIRELESS_11G_24N:
		case WIRELESS_11_24N:
		case WIRELESS_11BG_24N:
		memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
		memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
		memcpy(supported_rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
		memcpy(supported_rates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
		break;
		}
		}
		@@ -291,14 +291,14 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
		u8 wireless_mode;
		int sz = 0, rateLen;
		struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
		u8 *ie = pdev_network->IEs;
		u8 *ie = pdev_network->ies;

		/* timestamp will be inserted by hardware */
		sz += 8;
		ie += sz;

		/* beacon interval : 2bytes */
		(__le16 )ie = cpu_to_le16((u16)pdev_network->Configuration.BeaconPeriod);/* BCN_INTERVAL; */
		(__le16 )ie = cpu_to_le16((u16)pdev_network->configuration.BeaconPeriod);/* BCN_INTERVAL; */
		sz += 2;
		ie += 2;

		@@ -310,38 +310,38 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
		if (pregistrypriv->preamble == PREAMBLE_SHORT)
		(__le16 )ie \|= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);

		if (pdev_network->Privacy)
		if (pdev_network->privacy)
		(__le16 )ie \|= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);

		sz += 2;
		ie += 2;

		/* SSID */
		ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);
		ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.SsidLength, pdev_network->ssid.Ssid, &sz);

		/* supported rates */
		wireless_mode = pregistrypriv->wireless_mode;

		rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
		rtw_set_supported_rate(pdev_network->supported_rates, wireless_mode);

		rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);
		rateLen = rtw_get_rateset_len(pdev_network->supported_rates);

		if (rateLen > 8) {
		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, 8, pdev_network->SupportedRates, &sz);
		/* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */
		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, 8, pdev_network->supported_rates, &sz);
		/* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->supported_rates + 8), &sz); */
		} else {
		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rateLen, pdev_network->SupportedRates, &sz);
		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rateLen, pdev_network->supported_rates, &sz);
		}

		/* DS parameter set */
		ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, (u8 *)&(pdev_network->Configuration.DSConfig), &sz);
		ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, (u8 *)&(pdev_network->configuration.DSConfig), &sz);

		/* IBSS Parameter Set */

		ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2, (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);
		ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2, (u8 *)&(pdev_network->configuration.ATIMWindow), &sz);

		if (rateLen > 8) {
		ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);
		ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->supported_rates + 8), &sz);
		}

		/* HT Cap. */
		@@ -350,7 +350,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
		/* todo: */
		}

		/* pdev_network->IELength = sz; update IELength */
		/* pdev_network->ie_length = sz; update ie_length */

		/* return _SUCCESS; */

		@@ -1030,7 +1030,7 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
		int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;
		int ret = _FAIL;

		pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12);
		pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);

		if (pbuf && (wpa_ielen > 0)) {
		if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
		@@ -1040,7 +1040,7 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
		ret = _SUCCESS;
		}
		} else {
		pbuf = rtw_get_wpa2_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12);
		pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);

		if (pbuf && (wpa_ielen > 0)) {
		if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
		@@ -1067,15 +1067,15 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
		unsigned char *p;
		__le16 le_cap;

		memcpy((u8 *)&le_cap, rtw_get_capability_from_ie(pnetwork->network.IEs), 2);
		memcpy((u8 *)&le_cap, rtw_get_capability_from_ie(pnetwork->network.ies), 2);
		cap = le16_to_cpu(le_cap);
		if (cap & WLAN_CAPABILITY_PRIVACY) {
		bencrypt = 1;
		pnetwork->network.Privacy = 1;
		pnetwork->network.privacy = 1;
		} else {
		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;
		}
		rtw_get_sec_ie(pnetwork->network.IEs, pnetwork->network.IELength, NULL, &rsn_len, NULL, &wpa_len);
		rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length, NULL, &rsn_len, NULL, &wpa_len);

		if (rsn_len > 0) {
		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WPA2;
		@@ -1089,7 +1089,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)

		/* get bwmode and ch_offset */
		/* parsing HT_CAP_IE */
		p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);
		p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
		if (p && len > 0) {
		pht_cap = (struct ieee80211_ht_cap *)(p + 2);
		pnetwork->BcnInfo.ht_cap_info = le16_to_cpu(pht_cap->cap_info);
		@@ -1097,7 +1097,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
		pnetwork->BcnInfo.ht_cap_info = 0;
		}
		/* parsing HT_INFO_IE */
		p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);
		p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
		if (p && len > 0) {
		pht_info = (struct HT_info_element *)(p + 2);
		pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0];

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8723bs/core/rtw_mlme.c

+108 −108

File changed.

Preview size limit exceeded, changes collapsed.