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>

diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index a52662e8a2f651a098732d0195899763439c6047..73161b943b302b5a249592b2df5ed6e23ae6098d 100644 (file)
--- 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 9d0662cb96d013157424c8aba244bc24ea0983d5..442bdef47572ccfb29cd664bbe75b10e7c0e6517 100644 (file)
--- 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 799338b95afc54271f30e87c15391d6ae49c30ab..567be5ef36e4619735c064a7733c9c07da340978 100644 (file)
--- 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 a91198f8515455ad66e62ea197fdc44d0a30ad09..f40b73305196dd9ed0cf588040075a6e7b003062 100644 (file)
--- 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 c43c85591df584d215520ecbe4de0eed8a833e34..96e8074a7c188856a2ce65766bcc590364d8e2ac 100644 (file)
--- 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 4eef4083019186f5b0d2bac7ce46b88fbc1c7497..638e833e67af1cfccbad3800292075a0861fbae7 100644 (file)
--- 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);