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

staging:rtl8192u: Rename members of struct qos_tsinfo - Style

The member variables of struct qos_tsinfo all cause checkpatch issues
with CamelCase naming. As the variables are used in so few places the
changes are combined into this single patch.

Additionally the member variable usReserved is never used in code so
has been removed.

These are all coding style changes which should have no impact on
runtime code execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 893ce939
......@@ -626,7 +626,7 @@ TsInitAddBA(
pBA->DialogToken++; // DialogToken: Only keep the latest dialog token
pBA->BaParamSet.field.AMSDU_Support = 0; // Do not support A-MSDU with A-MPDU now!!
pBA->BaParamSet.field.BAPolicy = Policy; // Policy: Delayed or Immediate
pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.f.TSInfo.ucTSID; // TID
pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.f.TSInfo.uc_tsid; // TID
// BufferSize: This need to be set according to A-MPDU vector
pBA->BaParamSet.field.BufferSize = 32; // BufferSize: This need to be set according to A-MPDU vector
pBA->BaTimeoutValue = 0; // Timeout value: Set 0 to disable Timer
......
......@@ -34,16 +34,16 @@ enum direction_value {
* Note: sizeof 3 Bytes
*/
struct qos_tsinfo {
u16 ucTrafficType:1; //WMM is reserved
u16 ucTSID:4;
u16 ucDirection:2;
u16 ucAccessPolicy:2; //WMM: bit8=0, bit7=1
u16 ucAggregation:1; //WMM is reserved
u16 ucPSB:1; //WMMSA is APSD
u16 ucUP:3;
u16 ucTSInfoAckPolicy:2; //WMM is reserved
u8 ucSchedule:1; //WMM is reserved
u8 ucReserved:7;
u16 uc_traffic_type:1; //WMM is reserved
u16 uc_tsid:4;
u16 uc_direction:2;
u16 uc_access_policy:2; //WMM: bit8=0, bit7=1
u16 uc_aggregation:1; //WMM is reserved
u16 uc_psb:1; //WMMSA is APSD
u16 uc_up:3;
u16 uc_ts_info_ack_policy:2; //WMM is reserved
u8 uc_schedule:1; //WMM is reserved
u8:7;
};
//
......
......@@ -248,8 +248,8 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
list_for_each_entry(pRet, psearch_list, list){
// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.ucTSID, pRet->TSpec.f.TSInfo.ucDirection);
if (memcmp(pRet->addr, Addr, 6) == 0)
if (pRet->t_spec.f.TSInfo.ucTSID == TID)
if(pRet->t_spec.f.TSInfo.ucDirection == dir) {
if (pRet->t_spec.f.TSInfo.uc_tsid == TID)
if(pRet->t_spec.f.TSInfo.uc_direction == dir) {
// printk("Bingo! got it\n");
break;
}
......@@ -383,15 +383,15 @@ bool GetTs(
IEEE80211_DEBUG(IEEE80211_DL_TS, "to init current TS, UP:%d, Dir:%d, addr:%pM\n", UP, Dir, Addr);
// Prepare TS Info releated field
pTSInfo->ucTrafficType = 0; // Traffic type: WMM is reserved in this field
pTSInfo->ucTSID = UP; // TSID
pTSInfo->ucDirection = Dir; // Direction: if there is DirectLink, this need additional consideration.
pTSInfo->ucAccessPolicy = 1; // Access policy
pTSInfo->ucAggregation = 0; // Aggregation
pTSInfo->ucPSB = 0; // Aggregation
pTSInfo->ucUP = UP; // User priority
pTSInfo->ucTSInfoAckPolicy = 0; // Ack policy
pTSInfo->ucSchedule = 0; // Schedule
pTSInfo->uc_traffic_type = 0; // Traffic type: WMM is reserved in this field
pTSInfo->uc_tsid = UP; // TSID
pTSInfo->uc_direction = Dir; // Direction: if there is DirectLink, this need additional consideration.
pTSInfo->uc_access_policy = 1; // Access policy
pTSInfo->uc_aggregation = 0; // Aggregation
pTSInfo->uc_psb = 0; // Aggregation
pTSInfo->uc_up = UP; // User priority
pTSInfo->uc_ts_info_ack_policy = 0; // Ack policy
pTSInfo->uc_schedule = 0; // Schedule
MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0);
AdmitTS(ieee, *ppTS, 0);
......
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