staging: rtl8712: use common ieee80211 constants
PATCH 1/1 staging: rtl8712: use common ieee80211 constants
Many defined constants in wifi.h are unused and/or available from <linux/ieee80211.h>, some with slightly different names. Use the common ones, rename where necessary and remove unused.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/rtl8712/rtl871x_mlme.c | 8 +-- drivers/staging/rtl8712/wifi.h | 51 ------------------- 3 files changed, 5 insertions(+), 56 deletions(-)
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +1 -1
@@ -1411,7 +1411,7 @@ static int r8711_wx_get_rate(struct net_device *dev, pht_capie = (struct rtl_ieee80211_ht_cap *)(p +2 );memcpy (&mcs_rate, pht_capie->supp_mcs_set,2 ); bw_40MHz = (le16_to_cpu (pht_capie->cap_info) & -IEEE80211_HT_CAP_SUP_WIDTH ) ?1 :0 ; +IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) ?1 :0 ; short_GI = (le16_to_cpu (pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_SGI_40 )) ?1 :0 ;
drivers/staging/rtl8712/rtl871x_mlme.c +4 -4
@@ -1660,14 +1660,14 @@ unsigned int r8712_restructure_ht_ie(struct _adapter *padapter, u8 *in_ie, } out_len = *pout_len;memset (&ht_capie,0 ,sizeof (struct rtl_ieee80211_ht_cap )); - ht_capie.cap_info =cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH | + ht_capie.cap_info =cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH_20_40 |IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_SGI_40 |IEEE80211_HT_CAP_TX_STBC |IEEE80211_HT_CAP_MAX_AMSDU |IEEE80211_HT_CAP_DSSSCCK40 ); - ht_capie.ampdu_params_info = (IEEE80211_HT_CAP_AMPDU_FACTOR & -0x03 ) | (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); + ht_capie.ampdu_params_info = (IEEE80211_HT_AMPDU_PARM_FACTOR & +0x03 ) | (IEEE80211_HT_AMPDU_PARM_DENSITY &0x00 );r8712_set_ie (out_ie + out_len, _HT_CAPABILITY_IE_,sizeof (struct rtl_ieee80211_ht_cap ), (unsigned char *)&ht_capie, pout_len);
@@ -1705,7 +1705,7 @@ static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len)if (p && len >0 ) { pht_capie = (struct rtl_ieee80211_ht_cap *)(p +2 ); max_ampdu_sz = (pht_capie->ampdu_params_info & -IEEE80211_HT_CAP_AMPDU_FACTOR ); +IEEE80211_HT_AMPDU_PARM_FACTOR );/* max_ampdu_sz (kbytes); */ max_ampdu_sz =1 << (max_ampdu_sz +3 ); phtpriv->rx_ampdu_maxlen = max_ampdu_sz;
drivers/staging/rtl8712/wifi.h +0 -51
62 lines not on this page · raw message
Signature · 1 line
2.27.0