• Paul Gortmaker's avatar
    rtl8192u: align local ieee80211_wmm_ac_param struct fields with global · 7c6e3f24
    Paul Gortmaker authored
    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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    7c6e3f24
ieee80211_rx.c 77 KB