mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
rtl8192u: align local ieee80211_wmm_ac_param struct fields with global
The <linux/ieee80211.h> and this local file both have a struct of the same name. They also have the same field sizes and generally the same fields, as can be seen here: ~/git/linux-head$ git grep -A4 'struct ieee80211_wmm_ac_param {' drivers/staging/rtl8192u/ieee80211/ieee80211.h:struct ieee80211_wmm_ac_param { drivers/staging/rtl8192u/ieee80211/ieee80211.h- u8 ac_aci_acm_aifsn; drivers/staging/rtl8192u/ieee80211/ieee80211.h- u8 ac_ecwmin_ecwmax; drivers/staging/rtl8192u/ieee80211/ieee80211.h- u16 ac_txop_limit; drivers/staging/rtl8192u/ieee80211/ieee80211.h-}; -- include/linux/ieee80211.h:struct ieee80211_wmm_ac_param { include/linux/ieee80211.h- u8 aci_aifsn; /* AIFSN, ACM, ACI */ include/linux/ieee80211.h- u8 cw; /* ECWmin, ECWmax (CW = 2^ECW - 1) */ include/linux/ieee80211.h- __le16 txop_limit; include/linux/ieee80211.h-} __packed; ~/git/linux-head$ Here we just align the local field names with the main system one. Then we can add an include of the system one and delete the local copy in one smooth step in a follow-on commit. Not that the replacement: for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_aci_acm_aifsn/aci_aifsn/g' $i ; done for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_ecwmin_ecwmax/cw/g' $i ; done for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_txop_limit/txop_limit/g' $i ; done implicitly shows that only one of the three fields is currently used. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d140d6a15b
commit
7c6e3f24c3
2 changed files with 7 additions and 7 deletions
|
@ -1277,9 +1277,9 @@ struct ieee80211_tim_parameters {
|
|||
|
||||
//#else
|
||||
struct ieee80211_wmm_ac_param {
|
||||
u8 ac_aci_acm_aifsn;
|
||||
u8 ac_ecwmin_ecwmax;
|
||||
u16 ac_txop_limit;
|
||||
u8 aci_aifsn;
|
||||
u8 cw;
|
||||
u16 txop_limit;
|
||||
};
|
||||
|
||||
struct ieee80211_wmm_ts_info {
|
||||
|
|
|
@ -2366,10 +2366,10 @@ static inline void update_network(struct ieee80211_network *dst,
|
|||
|
||||
/* dst->last_associate is not overwritten */
|
||||
dst->wmm_info = src->wmm_info; //sure to exist in beacon or probe response frame.
|
||||
if (src->wmm_param[0].ac_aci_acm_aifsn|| \
|
||||
src->wmm_param[1].ac_aci_acm_aifsn|| \
|
||||
src->wmm_param[2].ac_aci_acm_aifsn|| \
|
||||
src->wmm_param[3].ac_aci_acm_aifsn) {
|
||||
if (src->wmm_param[0].aci_aifsn|| \
|
||||
src->wmm_param[1].aci_aifsn|| \
|
||||
src->wmm_param[2].aci_aifsn|| \
|
||||
src->wmm_param[3].aci_aifsn) {
|
||||
memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
|
||||
}
|
||||
//dst->QoS_Enable = src->QoS_Enable;
|
||||
|
|
Loading…
Reference in a new issue