staging: rtl8723au: Eliminate last rtw_get_beacon_interval*() usage

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_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 776068de545aaa37067adcd775e08bc20ba90f75..9a8c9ffd18376efc50aa89a1a10d340daab13fcb 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -312,11 +312,6 @@ void rtw23a_roaming(struct rtw_adapter *padapter,
        spin_unlock_bh(&pmlmepriv->lock);
 }
 
-__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie)
-{
-       return (__le16 *)(ie + 8);
-}
-
 static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
                                    struct wlan_network *pnetwork)
 {

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index d058178e793fe654afd1b1fce5522dc929dff36c..4047f6dadff21b12bef87c5b37109753f2649d51 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -4411,7 +4411,7 @@ static void start_create_ibss(struct rtw_adapter* padapter)
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
        struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
        pmlmeext->cur_channel = (u8)pnetwork->DSConfig;
-       pmlmeinfo->bcn_interval = get_beacon_interval23a(pnetwork);
+       pmlmeinfo->bcn_interval = pnetwork->beacon_interval;
 
        /* update wireless mode */
        update_wireless_mode23a(padapter);
@@ -4466,7 +4466,7 @@ static void start_clnt_join(struct rtw_adapter* padapter)
        int beacon_timeout;
 
        pmlmeext->cur_channel = (u8)pnetwork->DSConfig;
-       pmlmeinfo->bcn_interval = get_beacon_interval23a(pnetwork);
+       pmlmeinfo->bcn_interval = pnetwork->beacon_interval;
 
        /* update wireless mode */
        update_wireless_mode23a(padapter);

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index b07c13b2acee1b6053e8bcf06bd32955659b913d..dbca440beed444f39b09d66844c4a5dabd2ff6e0 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -399,14 +399,6 @@ inline u8 *get_my_bssid23a(struct wlan_bssid_ex *pnetwork)
        return pnetwork->MacAddress;
 }
 
-u16 get_beacon_interval23a(struct wlan_bssid_ex *bss)
-{
-       unsigned short val;
-       memcpy(&val, rtw_get_beacon_interval23a_from_ie(bss->IEs), 2);
-
-       return le16_to_cpu(val);
-}
-
 bool is_client_associated_to_ap23a(struct rtw_adapter *padapter)
 {
        struct mlme_ext_priv *pmlmeext;

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index 039e697e1ecdbbfe8d1d98b5b44319b4fd261684..a67954569d3e50e466dae8247a53529c2d752ad4 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -348,9 +348,6 @@ int rtw_if_up23a(struct rtw_adapter *padapter);
 
 int rtw_linked_check(struct rtw_adapter *padapter);
 
-__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie);
-
-
 void rtw_joinbss_reset23a(struct rtw_adapter *padapter);
 
 bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
index 0219aa14291a980b9943b7f0a41309cfe45e093a..7fd249f573b5522dc17554e8d48987076c535653 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
@@ -499,7 +499,6 @@ void update_network23a(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
                    struct rtw_adapter *padapter, bool update_ie);
 
 u8 *get_my_bssid23a(struct wlan_bssid_ex *pnetwork);
-u16 get_beacon_interval23a(struct wlan_bssid_ex *bss);
 
 bool is_client_associated_to_ap23a(struct rtw_adapter *padapter);
 bool is_client_associated_to_ibss23a(struct rtw_adapter *padapter);