From: Jes Sorensen Date: Thu, 19 Jun 2014 09:37:21 +0000 (+0200) Subject: staging: rtl8723au: rtw_cfg80211_inform_bss(): Use the capability info we already... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=11a80e8877bf2db8a13b68018049b48e367bd76e;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: rtw_cfg80211_inform_bss(): Use the capability info we already saved No point in pulling capability info out of the IE array when it's already stored in struct wlan_bssid_ex Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index ff838fcfea31..4eef40830191 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -247,7 +247,6 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter, struct cfg80211_bss *bss; u16 channel; u32 freq; - u16 notify_capability; u8 *notify_ie; size_t notify_ielen; s32 notify_signal; @@ -265,10 +264,6 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter, notify_channel = ieee80211_get_channel(wiphy, freq); - notify_capability = - get_unaligned_le16( - rtw_get_capability23a_from_ie(pnetwork->network.IEs)); - notify_ie = pnetwork->network.IEs + _FIXED_IE_LENGTH_; notify_ielen = pnetwork->network.IELength - _FIXED_IE_LENGTH_; @@ -286,7 +281,7 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter, bss = cfg80211_inform_bss(wiphy, notify_channel, pnetwork->network.MacAddress, pnetwork->network.tsf, - notify_capability, + pnetwork->network.capability, pnetwork->network.BeaconPeriod, notify_ie, notify_ielen, notify_signal, GFP_ATOMIC);