Commit 143ced27 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: struct wlan_bssid_ex: Rename BeaconPeriod to beacon_interval 



This is to be more consistent mapping the names in wlan_bssid_ex to
those in struct ieee80211_mgmt.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 11a80e88

drivers/staging/rtl8723au/core/rtw_ap.c

+2 −2
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf) 
	struct ieee80211_ht_operation *pht_info = NULL;

	int bcn_fixed_size;



	bcn_interval = (u16)pnetwork->BeaconPeriod;

	bcn_interval = (u16)pnetwork->beacon_interval;

	cur_channel = pnetwork->DSConfig;

	cur_bwmode = HT_CHANNEL_WIDTH_20;;

	cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
@@ -847,7 +847,7 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf, 
	/* beacon interval */

	/* ie + 8;  8: TimeStamp, 2: Beacon Interval 2:Capability */

	pbeacon = rtw_get_beacon_interval23a_from_ie(ie);

	pbss_network->BeaconPeriod = get_unaligned_le16(pbeacon);

	pbss_network->beacon_interval = get_unaligned_le16(pbeacon);



	/* capability */

	cap = get_unaligned_le16(ie);

drivers/staging/rtl8723au/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv) 


	/* beacon interval : 2bytes */

	/* BCN_INTERVAL; */

	*(u16*)ie = cpu_to_le16(pdev_network->BeaconPeriod);

	*(u16*)ie = cpu_to_le16(pdev_network->beacon_interval);

	sz += 2;

	ie += 2;

drivers/staging/rtl8723au/core/rtw_mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -2117,7 +2117,7 @@ void rtw_init_registrypriv_dev_network23a(struct rtw_adapter* adapter) 
	memcpy(&pdev_network->Ssid, &pregistrypriv->ssid,

	       sizeof(struct cfg80211_ssid));



	pdev_network->BeaconPeriod = 100;

	pdev_network->beacon_interval = 100;

}



void rtw_update_registrypriv_dev_network23a(struct rtw_adapter* adapter)

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+6 −6
Original line number Diff line number Diff line
@@ -4279,7 +4279,7 @@ static struct wlan_bssid_ex *collect_bss_info(struct rtw_adapter *padapter, 
		ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);

		bssid->capability =

			get_unaligned_le16(&mgmt->u.beacon.capab_info);

		bssid->BeaconPeriod =

		bssid->beacon_interval =

			get_unaligned_le16(&mgmt->u.beacon.beacon_int);

		bssid->tsf = get_unaligned_le64(&mgmt->u.beacon.timestamp);

	} else  if (ieee80211_is_probe_req(mgmt->frame_control)) {
@@ -4287,8 +4287,8 @@ static struct wlan_bssid_ex *collect_bss_info(struct rtw_adapter *padapter, 
				     u.probe_req.variable);

		bssid->reserved = 2;

		bssid->capability = 0;

		bssid->BeaconPeriod =

			padapter->registrypriv.dev_network.BeaconPeriod;

		bssid->beacon_interval =

			padapter->registrypriv.dev_network.beacon_interval;

		bssid->tsf = 0;

	} else if (ieee80211_is_probe_resp(mgmt->frame_control)) {

		ie_offset = offsetof(struct ieee80211_mgmt,
@@ -4296,7 +4296,7 @@ static struct wlan_bssid_ex *collect_bss_info(struct rtw_adapter *padapter, 
		bssid->reserved = 3;

		bssid->capability =

			get_unaligned_le16(&mgmt->u.probe_resp.capab_info);

		bssid->BeaconPeriod =

		bssid->beacon_interval =

			get_unaligned_le16(&mgmt->u.probe_resp.beacon_int);

		bssid->tsf = get_unaligned_le64(&mgmt->u.probe_resp.timestamp);

	} else {
@@ -4304,8 +4304,8 @@ static struct wlan_bssid_ex *collect_bss_info(struct rtw_adapter *padapter, 
		ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);

		bssid->capability =

			get_unaligned_le16(&mgmt->u.beacon.capab_info);

		bssid->BeaconPeriod =

			padapter->registrypriv.dev_network.BeaconPeriod;

		bssid->beacon_interval =

			padapter->registrypriv.dev_network.beacon_interval;

		bssid->tsf = 0;

	}

	ie_offset -= offsetof(struct ieee80211_mgmt, u);

drivers/staging/rtl8723au/include/wlan_bssdef.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct wlan_bssid_ex { 
	struct cfg80211_ssid Ssid;

	u32  Privacy;

	long  Rssi;/* in dBM, raw data , get from PHY) */

	u16 BeaconPeriod;       /*  units are Kusec */

	u16 beacon_interval;

	u16 capability;

	u64 tsf;

	u32 ATIMWindow;         /*  units are Kusec */

CRA Git | Maintained and supported by SUSTech CRA and CCSE