hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/staging/rtl8712/rtl871x_mlme.c
....@@ -1649,11 +1649,11 @@
16491649 struct ht_priv *phtpriv = &pmlmepriv->htpriv;
16501650
16511651 phtpriv->ht_option = 0;
1652
- p = r8712_get_ie(in_ie + 12, _HT_CAPABILITY_IE_, &ielen, in_len - 12);
1652
+ p = r8712_get_ie(in_ie + 12, WLAN_EID_HT_CAPABILITY, &ielen, in_len - 12);
16531653 if (p && (ielen > 0)) {
16541654 if (pqospriv->qos_option == 0) {
16551655 out_len = *pout_len;
1656
- r8712_set_ie(out_ie + out_len, _VENDOR_SPECIFIC_IE_,
1656
+ r8712_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC,
16571657 _WMM_IE_Length_, WMM_IE, pout_len);
16581658 pqospriv->qos_option = 1;
16591659 }
....@@ -1667,7 +1667,7 @@
16671667 IEEE80211_HT_CAP_DSSSCCK40);
16681668 ht_capie.ampdu_params_info = (IEEE80211_HT_AMPDU_PARM_FACTOR &
16691669 0x03) | (IEEE80211_HT_AMPDU_PARM_DENSITY & 0x00);
1670
- r8712_set_ie(out_ie + out_len, _HT_CAPABILITY_IE_,
1670
+ r8712_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY,
16711671 sizeof(struct rtl_ieee80211_ht_cap),
16721672 (unsigned char *)&ht_capie, pout_len);
16731673 phtpriv->ht_option = 1;
....@@ -1698,7 +1698,7 @@
16981698 /*check Max Rx A-MPDU Size*/
16991699 len = 0;
17001700 p = r8712_get_ie(pie + sizeof(struct NDIS_802_11_FIXED_IEs),
1701
- _HT_CAPABILITY_IE_,
1701
+ WLAN_EID_HT_CAPABILITY,
17021702 &len, ie_len -
17031703 sizeof(struct NDIS_802_11_FIXED_IEs));
17041704 if (p && len > 0) {
....@@ -1733,7 +1733,7 @@
17331733 }
17341734 len = 0;
17351735 p = r8712_get_ie(pie + sizeof(struct NDIS_802_11_FIXED_IEs),
1736
- _HT_ADD_INFO_IE_, &len,
1736
+ WLAN_EID_HT_OPERATION, &len,
17371737 ie_len - sizeof(struct NDIS_802_11_FIXED_IEs));
17381738 }
17391739