staging: rtl8723au: issue_assocrsp(): Use capability from struct wlan_bssid_ex
authorJes Sorensen <Jes.Sorensen@redhat.com>
Thu, 19 Jun 2014 09:37:30 +0000 (11:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 20:08:51 +0000 (13:08 -0700)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/core/rtw_mlme_ext.c

index d2a09c653e72d8775487d60d665a958b2cd908cc..a8bc12c1fe39bc365a7b1caa5e7a15ab97748110 100644 (file)
@@ -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));