tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: r8188eu: change rtw_ieee80211_ht_cap type of structures members to ieee80211_ht_cap

Also cap_info member of ieee80211_ht_cap wrapped by le16_to_cpu function.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman cfecac2e c7873d8b

+14 -9
+10 -5
drivers/staging/rtl8188eu/core/rtw_ap.c
··· 481 481 limit = 8;/* 1R */ 482 482 483 483 for (i = 0; i < limit; i++) { 484 - if (psta_ht->ht_cap.supp_mcs_set[i/8] & BIT(i%8)) 484 + if (psta_ht->ht_cap.mcs.rx_mask[i / 8] & BIT(i % 8)) 485 485 tx_ra_bitmap |= BIT(i+12); 486 486 } 487 487 ··· 658 658 phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; 659 659 660 660 /* check if sta support s Short GI */ 661 - if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) 661 + if (le16_to_cpu(phtpriv_sta->ht_cap.cap_info & 662 + phtpriv_ap->ht_cap.cap_info) & 663 + (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) 662 664 phtpriv_sta->sgi = true; 663 665 664 666 /* bwmode */ 665 - if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) { 667 + if (le16_to_cpu(phtpriv_sta->ht_cap.cap_info & 668 + phtpriv_ap->ht_cap.cap_info) & 669 + IEEE80211_HT_CAP_SUP_WIDTH) { 666 670 phtpriv_sta->bwmode = pmlmeext->cur_bwmode; 667 671 phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset; 668 672 } ··· 1426 1422 if (pmlmepriv->num_sta_no_ht || 1427 1423 (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)) 1428 1424 new_op_mode = OP_MODE_MIXED; 1429 - else if ((phtpriv_ap->ht_cap.cap_info & IEEE80211_HT_CAP_SUP_WIDTH) && 1425 + else if ((le16_to_cpu(phtpriv_ap->ht_cap.cap_info) & 1426 + IEEE80211_HT_CAP_SUP_WIDTH) && 1430 1427 pmlmepriv->num_sta_ht_20mhz) 1431 1428 new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED; 1432 1429 else if (pmlmepriv->olbc_ht) ··· 1557 1552 } 1558 1553 1559 1554 if (psta->flags & WLAN_STA_HT) { 1560 - u16 ht_capab = psta->htpriv.ht_cap.cap_info; 1555 + u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info); 1561 1556 1562 1557 DBG_88E("HT: STA %pM HT Capabilities Info: 0x%04x\n", 1563 1558 (psta->hwaddr), ht_capab);
+2 -2
drivers/staging/rtl8188eu/include/ieee80211.h
··· 239 239 u16 capability; 240 240 int flags; 241 241 u8 tx_supp_rates[16]; 242 - struct rtw_ieee80211_ht_cap ht_cap; 242 + struct ieee80211_ht_cap ht_cap; 243 243 } add_sta; 244 244 struct { 245 245 u8 reserved[2];/* for set max_num_sta */ ··· 264 264 u32 sta_set; 265 265 u8 tx_supp_rates[16]; 266 266 u32 tx_supp_rates_len; 267 - struct rtw_ieee80211_ht_cap ht_cap; 267 + struct ieee80211_ht_cap ht_cap; 268 268 u64 rx_pkts; 269 269 u64 rx_bytes; 270 270 u64 rx_drops;
+2 -2
drivers/staging/rtl8188eu/include/rtw_ht.h
··· 15 15 #ifndef _RTW_HT_H_ 16 16 #define _RTW_HT_H_ 17 17 18 + #include <linux/ieee80211.h> 18 19 #include <osdep_service.h> 19 - #include "wifi.h" 20 20 21 21 struct ht_priv { 22 22 u32 ht_option; ··· 33 33 u8 agg_enable_bitmap; 34 34 u8 candidate_tid_bitmap; 35 35 36 - struct rtw_ieee80211_ht_cap ht_cap; 36 + struct ieee80211_ht_cap ht_cap; 37 37 }; 38 38 39 39 #endif /* _RTL871X_HT_H_ */