From: John Whitmore Date: Sat, 28 Jul 2018 23:14:51 +0000 (+0100) Subject: staging:rtl8192u: Rename union QOS_TSINFO - Style X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8e542c484c80ced3d849b2e5380deb8bc4329368;p=openwrt%2Fstaging%2Fblogic.git staging:rtl8192u: Rename union QOS_TSINFO - Style The union QOS_TSINFO, as a type, should have a lowercase name. The union has therefore been renamed to qos_tsinfo. Additionally the 'typedef' directive has been removed to clear the checkpatch issue with defining new types. These are coding style changes which should have no impact on runtime code execution. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h index 428a8c4cebf1..17b676b0ed8b 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h @@ -42,7 +42,7 @@ enum direction_value { // 1. WMM spec 2.2.11: WME TSPEC Element, p.18. // 2. 8185 QoS code: QOS_TSINFO [def. in QoS_mp.h] // -typedef union _QOS_TSINFO { +union qos_tsinfo { u8 charData[3]; struct { u8 ucTrafficType:1; //WMM is reserved @@ -56,7 +56,7 @@ typedef union _QOS_TSINFO { u8 ucSchedule:1; //WMM is reserved u8 ucReserved:7; } field; -} QOS_TSINFO, *PQOS_TSINFO; +}; // // WMM TSPEC Body. @@ -66,7 +66,7 @@ typedef union _TSPEC_BODY { u8 charData[55]; struct { - QOS_TSINFO TSInfo; //u8 TSInfo[3]; + union qos_tsinfo TSInfo; //u8 TSInfo[3]; u16 NominalMSDUsize; u16 MaxMSDUsize; u32 MinServiceItv; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index 2731e46556f4..c21bf3d3b242 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c @@ -355,7 +355,7 @@ bool GetTs( // For HCCA or WMMSA, TS cannot be addmit without negotiation. // TSPEC_BODY TSpec; - PQOS_TSINFO pTSInfo = &TSpec.f.TSInfo; + union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo; struct list_head *pUnusedList = (TxRxSelect == TX_DIR)? (&ieee->Tx_TS_Unused_List):