From: Jes Sorensen Date: Thu, 19 Jun 2014 09:37:32 +0000 (+0200) Subject: staging: rtl8723au: rtw_get_bcn_info23a(): Use capability from wlan_bssid_ex X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ce73e2e6aafde2915d2210e644de94203212a04;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: rtw_get_bcn_info23a(): Use capability from wlan_bssid_ex This eliminates yet another user of rtw_get_capability23a_from_ie() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c index 442bdef47572..d60fb3c06f9c 100644 --- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c @@ -770,15 +770,12 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) void rtw_get_bcn_info23a(struct wlan_network *pnetwork) { - unsigned short cap; u8 bencrypt = 0; int pie_len, ie_offset; u8 *pie; const u8 *p; - cap = get_unaligned_le16( - rtw_get_capability23a_from_ie(pnetwork->network.IEs)); - if (cap & WLAN_CAPABILITY_PRIVACY) { + if (pnetwork->network.capability & WLAN_CAPABILITY_PRIVACY) { bencrypt = 1; pnetwork->network.Privacy = 1; } else