UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-06-19 11:37:22 +02:00 committed by Greg Kroah-Hartman
parent 11a80e8877
commit 143ced27ac
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8723au/core/rtw_ap.c
View File

@ -655,7 +655,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
struct ieee80211_ht_operation *pht_info = NULL; struct ieee80211_ht_operation *pht_info = NULL;
int bcn_fixed_size; int bcn_fixed_size;
bcn_interval = (u16)pnetwork->BeaconPeriod; bcn_interval = (u16)pnetwork->beacon_interval;
cur_channel = pnetwork->DSConfig; cur_channel = pnetwork->DSConfig;
cur_bwmode = HT_CHANNEL_WIDTH_20;; cur_bwmode = HT_CHANNEL_WIDTH_20;;
cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; 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 */ /* beacon interval */
/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */ /* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */
pbeacon = rtw_get_beacon_interval23a_from_ie(ie); pbeacon = rtw_get_beacon_interval23a_from_ie(ie);
pbss_network->BeaconPeriod = get_unaligned_le16(pbeacon); pbss_network->beacon_interval = get_unaligned_le16(pbeacon);
/* capability */ /* capability */
cap = get_unaligned_le16(ie); cap = get_unaligned_le16(ie);

2
drivers/staging/rtl8723au/core/rtw_ieee80211.c
View File

@ -360,7 +360,7 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv)
/* beacon interval : 2bytes */ /* beacon interval : 2bytes */
/* BCN_INTERVAL; */ /* BCN_INTERVAL; */
*(u16*)ie = cpu_to_le16(pdev_network->BeaconPeriod); *(u16*)ie = cpu_to_le16(pdev_network->beacon_interval);
sz += 2; sz += 2;
ie += 2; ie += 2;

2
drivers/staging/rtl8723au/core/rtw_mlme.c
View File

@ -2117,7 +2117,7 @@ void rtw_init_registrypriv_dev_network23a(struct rtw_adapter* adapter)
memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, memcpy(&pdev_network->Ssid, &pregistrypriv->ssid,
sizeof(struct cfg80211_ssid)); sizeof(struct cfg80211_ssid));
pdev_network->BeaconPeriod = 100; pdev_network->beacon_interval = 100;
} }
void rtw_update_registrypriv_dev_network23a(struct rtw_adapter* adapter) void rtw_update_registrypriv_dev_network23a(struct rtw_adapter* adapter)

12
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@ -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); ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);
bssid->capability = bssid->capability =
get_unaligned_le16(&mgmt->u.beacon.capab_info); get_unaligned_le16(&mgmt->u.beacon.capab_info);
bssid->BeaconPeriod = bssid->beacon_interval =
get_unaligned_le16(&mgmt->u.beacon.beacon_int); get_unaligned_le16(&mgmt->u.beacon.beacon_int);
bssid->tsf = get_unaligned_le64(&mgmt->u.beacon.timestamp); bssid->tsf = get_unaligned_le64(&mgmt->u.beacon.timestamp);
} else if (ieee80211_is_probe_req(mgmt->frame_control)) { } 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); u.probe_req.variable);
bssid->reserved = 2; bssid->reserved = 2;
bssid->capability = 0; bssid->capability = 0;
bssid->BeaconPeriod = bssid->beacon_interval =
padapter->registrypriv.dev_network.BeaconPeriod; padapter->registrypriv.dev_network.beacon_interval;
bssid->tsf = 0; bssid->tsf = 0;
} else if (ieee80211_is_probe_resp(mgmt->frame_control)) { } else if (ieee80211_is_probe_resp(mgmt->frame_control)) {
ie_offset = offsetof(struct ieee80211_mgmt, 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->reserved = 3;
bssid->capability = bssid->capability =
get_unaligned_le16(&mgmt->u.probe_resp.capab_info); get_unaligned_le16(&mgmt->u.probe_resp.capab_info);
bssid->BeaconPeriod = bssid->beacon_interval =
get_unaligned_le16(&mgmt->u.probe_resp.beacon_int); get_unaligned_le16(&mgmt->u.probe_resp.beacon_int);
bssid->tsf = get_unaligned_le64(&mgmt->u.probe_resp.timestamp); bssid->tsf = get_unaligned_le64(&mgmt->u.probe_resp.timestamp);
} else { } 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); ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);
bssid->capability = bssid->capability =
get_unaligned_le16(&mgmt->u.beacon.capab_info); get_unaligned_le16(&mgmt->u.beacon.capab_info);
bssid->BeaconPeriod = bssid->beacon_interval =
padapter->registrypriv.dev_network.BeaconPeriod; padapter->registrypriv.dev_network.beacon_interval;
bssid->tsf = 0; bssid->tsf = 0;
} }
ie_offset -= offsetof(struct ieee80211_mgmt, u); ie_offset -= offsetof(struct ieee80211_mgmt, u);

2
drivers/staging/rtl8723au/include/wlan_bssdef.h
View File

@ -92,7 +92,7 @@ struct wlan_bssid_ex {
struct cfg80211_ssid Ssid; struct cfg80211_ssid Ssid;
u32 Privacy; u32 Privacy;
long Rssi;/* in dBM, raw data , get from PHY) */ long Rssi;/* in dBM, raw data , get from PHY) */
u16 BeaconPeriod; /* units are Kusec */ u16 beacon_interval;
u16 capability; u16 capability;
u64 tsf; u64 tsf;
u32 ATIMWindow; /* units are Kusec */ u32 ATIMWindow; /* units are Kusec */

2
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View File

@ -282,7 +282,7 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter,
pnetwork->network.MacAddress, pnetwork->network.MacAddress,
pnetwork->network.tsf, pnetwork->network.tsf,
pnetwork->network.capability, pnetwork->network.capability,
pnetwork->network.BeaconPeriod, pnetwork->network.beacon_interval,
notify_ie, notify_ielen, notify_ie, notify_ielen,
notify_signal, GFP_ATOMIC); notify_signal, GFP_ATOMIC);