diff options
| author |   John Whitmore <johnfwhitmore@gmail.com> | 2018-07-31 21:59:53 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-02 09:46:00 +0200 |
| commit | ab9a066577f9529fa112743078e60ce7afbc194e (patch) | |
| tree | c022c144dae48d4406bc0fe0644025957b98efd8 /drivers/staging/rtl8192u | |
| parent | staging:rtl8192u: Clean cmpk_counttxstatistic() comments - Style (diff) | |
| download | linux-dev-ab9a066577f9529fa112743078e60ce7afbc194e.tar.xz linux-dev-ab9a066577f9529fa112743078e60ce7afbc194e.zip | |
staging:rtl8192u: Remove union from aci_aifsn - Style
The union aci_aifsn is not used as a union, but only as a struct.
The union seems to have been used to ensure that the size of the
structure was only a single byte. That size is set by the bitfield
structure, adding a union with an unused byte adds nothing.
The union has been removed. This is a coding style change and
should not impact runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 23 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_dm.c | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h index 810d81addcf6..1f16d1692c03 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h @@ -2,19 +2,16 @@ #ifndef __INC_QOS_TYPE_H #define __INC_QOS_TYPE_H -// -// ACI/AIFSN Field. -// Ref: WMM spec 2.2.2: WME Parameter Element, p.12. -// -union aci_aifsn { - u8 char_data; - - struct { - u8 aifsn:4; - u8 acm:1; - u8 aci:2; - u8 reserved:1; - } f; // Field +/* + * ACI/AIFSN Field. + * Ref: WMM spec 2.2.2: WME Parameter Element, p.12. + * Note: 1 Byte Length + */ +struct aci_aifsn { + u8 aifsn:4; + u8 acm:1; + u8 aci:2; + u8:1; }; // diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index 92ba1fdd9831..0ba1b1e2bc6e 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c @@ -2242,12 +2242,12 @@ static void dm_check_edca_turbo( { /* TODO: Modified this part and try to set acm control in only 1 IO processing!! */ - union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]); + struct aci_aifsn *pAciAifsn = (struct aci_aifsn *)&(qos_parameters->aifs[0]); u8 AcmCtrl; read_nic_byte(dev, AcmHwCtrl, &AcmCtrl); - if (pAciAifsn->f.acm) { /* acm bit is 1. */ + if (pAciAifsn->acm) { /* acm bit is 1. */ AcmCtrl |= AcmHw_BeqEn; } else { /* ACM bit is 0. */ AcmCtrl &= (~AcmHw_BeqEn); |