From: Jes Sorensen Date: Thu, 19 Jun 2014 09:37:30 +0000 (+0200) Subject: staging: rtl8723au: issue_assocrsp(): Use capability from struct wlan_bssid_ex X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5376badca02fabc7ca3ffa9e7dd5e795a4250486;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: issue_assocrsp(): Use capability from struct wlan_bssid_ex Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index d2a09c653e72..a8bc12c1fe39 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -3051,7 +3051,6 @@ static void issue_assocrsp(struct rtw_adapter *padapter, unsigned short status, struct ieee80211_mgmt *mgmt; struct pkt_attrib *pattrib; unsigned char *pframe; - unsigned short val; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -3089,10 +3088,7 @@ static void issue_assocrsp(struct rtw_adapter *padapter, unsigned short status, pattrib->pktlen = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable); - /* capability */ - val = *(unsigned short *)rtw_get_capability23a_from_ie(ie); - - mgmt->u.assoc_resp.capab_info = val; + mgmt->u.assoc_resp.capab_info = cpu_to_le16(pnetwork->capability); mgmt->u.assoc_resp.status_code = cpu_to_le16(status); mgmt->u.assoc_resp.aid = cpu_to_le16(pstat->aid | BIT(14) | BIT(15));