From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Thu, 19 Jun 2014 09:37:34 +0000 (+0200)
Subject: staging: rtl8723au: Remove last users of rtw_get_capability*() functions
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a94e12b18331194d2ac9fe37da9da6c5c3b244d4;p=linux-beck.git

staging: rtl8723au: Remove last users of rtw_get_capability*() functions

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 e943b6be6496..2a960b1ba066 100644
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -773,7 +773,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
 	update_wireless_mode23a(padapter);
 
 	/* udpate capability after cur_wireless_mode updated */
-	update_capinfo23a(padapter, rtw_get_capability23a(pnetwork));
+	update_capinfo23a(padapter, pnetwork->capability);
 
 	/* let pnetwork_mlmeext == pnetwork_mlme. */
 	memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 2119dfb9bbab..776068de545a 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -312,20 +312,6 @@ void rtw23a_roaming(struct rtw_adapter *padapter,
 	spin_unlock_bh(&pmlmepriv->lock);
 }
 
-__le16 *rtw_get_capability23a_from_ie(u8 *ie)
-{
-	return (__le16 *)(ie + 8 + 2);
-}
-
-u16 rtw_get_capability23a(struct wlan_bssid_ex *bss)
-{
-	u16 val;
-
-	memcpy(&val, rtw_get_capability23a_from_ie(bss->IEs), 2);
-
-	return le16_to_cpu(val);
-}
-
 __le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie)
 {
 	return (__le16 *)(ie + 8);
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index f7ddd6a19026..d058178e793f 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -4417,7 +4417,7 @@ static void start_create_ibss(struct rtw_adapter* padapter)
 	update_wireless_mode23a(padapter);
 
 	/* udpate capability */
-	caps = rtw_get_capability23a(pnetwork);
+	caps = pnetwork->capability;
 	update_capinfo23a(padapter, caps);
 	if (caps & WLAN_CAPABILITY_IBSS) {	/* adhoc master */
 		rtl8723a_set_sec_cfg(padapter, 0xcf);
@@ -4472,7 +4472,7 @@ static void start_clnt_join(struct rtw_adapter* padapter)
 	update_wireless_mode23a(padapter);
 
 	/* udpate capability */
-	caps = rtw_get_capability23a(pnetwork);
+	caps = pnetwork->capability;
 	update_capinfo23a(padapter, caps);
 	if (caps & WLAN_CAPABILITY_ESS) {
 		/* switch channel */
diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 5aaff130d55d..b07c13b2acee 100644
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -1083,7 +1083,7 @@ bool is_ap_in_tkip23a(struct rtw_adapter *padapter)
 	bcn_fixed_size = offsetof(struct ieee80211_mgmt, u.beacon.variable) -
 		offsetof(struct ieee80211_mgmt, u.beacon);
 
-	if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
+	if (cur_network->capability & WLAN_CAPABILITY_PRIVACY) {
 		for (i = bcn_fixed_size; i < pmlmeinfo->network.IELength;) {
 			p = pmlmeinfo->network.IEs + i;
 
@@ -1118,7 +1118,7 @@ bool should_forbid_n_rate23a(struct rtw_adapter * padapter)
 	bcn_fixed_size = offsetof(struct ieee80211_mgmt, u.beacon.variable) -
 		offsetof(struct ieee80211_mgmt, u.beacon);
 
-	if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
+	if (cur_network->capability & WLAN_CAPABILITY_PRIVACY) {
 		for (i = bcn_fixed_size; i < cur_network->IELength;) {
 			p = cur_network->IEs + i;
 
@@ -1161,7 +1161,7 @@ bool is_ap_in_wep23a(struct rtw_adapter *padapter)
 	bcn_fixed_size = offsetof(struct ieee80211_mgmt, u.beacon.variable) -
 		offsetof(struct ieee80211_mgmt, u.beacon);
 
-	if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
+	if (cur_network->capability & WLAN_CAPABILITY_PRIVACY) {
 		for (i = bcn_fixed_size; i < pmlmeinfo->network.IELength;) {
 			p = pmlmeinfo->network.IEs + i;
 
diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index bc420ec6f436..039e697e1ecd 100644
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -310,7 +310,6 @@ static inline void clr_fwstate_ex(struct mlme_priv *pmlmepriv, int state)
 	spin_unlock_bh(&pmlmepriv->lock);
 }
 
-u16 rtw_get_capability23a(struct wlan_bssid_ex *bss);
 void rtw_disconnect_hdl23a_under_linked(struct rtw_adapter *adapter,
 				     struct sta_info *psta, u8 free_assoc);
 void rtw_generate_random_ibss23a(u8 *pibss);
@@ -349,7 +348,6 @@ int rtw_if_up23a(struct rtw_adapter *padapter);
 
 int rtw_linked_check(struct rtw_adapter *padapter);
 
-__le16 *rtw_get_capability23a_from_ie(u8 *ie);
 __le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie);