Commit ab9a0665 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

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: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f40eb13
...@@ -2,19 +2,16 @@ ...@@ -2,19 +2,16 @@
#ifndef __INC_QOS_TYPE_H #ifndef __INC_QOS_TYPE_H
#define __INC_QOS_TYPE_H #define __INC_QOS_TYPE_H
// /*
// ACI/AIFSN Field. * ACI/AIFSN Field.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.12. * Ref: WMM spec 2.2.2: WME Parameter Element, p.12.
// * Note: 1 Byte Length
union aci_aifsn { */
u8 char_data; struct aci_aifsn {
struct {
u8 aifsn:4; u8 aifsn:4;
u8 acm:1; u8 acm:1;
u8 aci:2; u8 aci:2;
u8 reserved:1; u8:1;
} f; // Field
}; };
// //
......
...@@ -2242,12 +2242,12 @@ static void dm_check_edca_turbo( ...@@ -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!! */ /* 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; u8 AcmCtrl;
read_nic_byte(dev, AcmHwCtrl, &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; AcmCtrl |= AcmHw_BeqEn;
} else { /* ACM bit is 0. */ } else { /* ACM bit is 0. */
AcmCtrl &= (~AcmHw_BeqEn); AcmCtrl &= (~AcmHw_BeqEn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment