From 143ced27acaa948cbcf34cafe0bca3c926fd35fc Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Thu, 19 Jun 2014 11:37:22 +0200 Subject: [PATCH] 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: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723au/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723au/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 12 ++++++------ drivers/staging/rtl8723au/include/wlan_bssdef.h | 2 +- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c index a52662e8a2f6..73161b943b30 100644 --- a/drivers/staging/rtl8723au/core/rtw_ap.c +++ b/drivers/staging/rtl8723au/core/rtw_ap.c @@ -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); diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c index 9d0662cb96d0..442bdef47572 100644 --- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c @@ -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; diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index 799338b95afc..567be5ef36e4 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -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) diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index a91198f85154..f40b73305196 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -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); diff --git a/drivers/staging/rtl8723au/include/wlan_bssdef.h b/drivers/staging/rtl8723au/include/wlan_bssdef.h index c43c85591df5..96e8074a7c18 100644 --- a/drivers/staging/rtl8723au/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723au/include/wlan_bssdef.h @@ -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 */ diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index 4eef40830191..638e833e67af 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -282,7 +282,7 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter, pnetwork->network.MacAddress, pnetwork->network.tsf, pnetwork->network.capability, - pnetwork->network.BeaconPeriod, + pnetwork->network.beacon_interval, notify_ie, notify_ielen, notify_signal, GFP_ATOMIC);