From 21c875a59c99529429cc9ffa9f24bfa0821e0327 Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Tue, 21 Aug 2018 18:15:26 +0100 Subject: [PATCH] staging:rtl8192u: Remove charData and rename shortData - Style The union ba_param_set contains the member variable charData which is unused. The variable has been removed. Additionally the member variable shortData has been renamed to clear a checkpatch issue with CamelCase naming. These are coding style changes which should not impact runtime code execution. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 3 +-- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h index 44f820404347..d3730fc6c8fe 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h @@ -31,8 +31,7 @@ union sequence_control { }; union ba_param_set { - u8 charData[2]; - u16 shortData; + u16 short_data; struct { u16 AMSDU_Support:1; u16 BAPolicy:1; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c index 469e3e9a0d2e..1a9271548b94 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c @@ -90,7 +90,7 @@ static u8 RxTsDeleteBA(struct ieee80211_device *ieee, struct rx_ts_record *pRxTs void ResetBaEntry(PBA_RECORD pBA) { pBA->bValid = false; - pBA->BaParamSet.shortData = 0; + pBA->BaParamSet.short_data = 0; pBA->BaTimeoutValue = 0; pBA->DialogToken = 0; pBA->BaStartSeqCtrl.short_data = 0; @@ -151,7 +151,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, P } // BA Parameter Set - put_unaligned_le16(pBA->BaParamSet.shortData, tag); + put_unaligned_le16(pBA->BaParamSet.short_data, tag); tag += 2; // BA Timeout Value -- 2.11.0