Skip to content

L
linux
Commit f88ec6cb authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VI 

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 831cb9db
Expand all Show whitespace changes
Inline Side-by-side
Showing with 312 additions and 308 deletions
drivers/staging/rtl8192e/rtl819x_Qos.h
View file @ f88ec6cb
...@@ -67,14 +67,13 @@ union qos_tsinfo { ...@@ -67,14 +67,13 @@ union qos_tsinfo {
u8 ucTSInfoAckPolicy:2; u8 ucTSInfoAckPolicy:2;
u8 ucSchedule:1; u8 ucSchedule:1;
u8 ucReserved:7; u8 ucReserved:7;
}field; } field;
}; };
union tspec_body { union tspec_body {
u8 charData[55]; u8 charData[55];
struct struct {
{
union qos_tsinfo TSInfo; union qos_tsinfo TSInfo;
u16 NominalMSDUsize; u16 NominalMSDUsize;
u16 MaxMSDUsize; u16 MaxMSDUsize;
...@@ -108,6 +107,7 @@ struct octet_string { ...@@ -108,6 +107,7 @@ struct octet_string {
u8 *Octet; u8 *Octet;
u16 Length; u16 Length;
}; };
#define MAX_WMMELE_LENGTH 64 #define MAX_WMMELE_LENGTH 64
#define QOS_MODE u32 #define QOS_MODE u32
...@@ -143,28 +143,43 @@ enum ack_policy { ...@@ -143,28 +143,43 @@ enum ack_policy {
}; };
#define SET_WMM_QOS_INFO_FIELD(_pStart, _val) WriteEF1Byte(_pStart, _val) #define SET_WMM_QOS_INFO_FIELD(_pStart, _val) \
WriteEF1Byte(_pStart, _val)
#define GET_WMM_QOS_INFO_FIELD_PARAMETERSET_COUNT(_pStart) LE_BITS_TO_1BYTE(_pStart, 0, 4) #define GET_WMM_QOS_INFO_FIELD_PARAMETERSET_COUNT(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_PARAMETERSET_COUNT(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 0, 4, _val) LE_BITS_TO_1BYTE(_pStart, 0, 4)
#define SET_WMM_QOS_INFO_FIELD_PARAMETERSET_COUNT(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 0, 4, _val)
#define GET_WMM_QOS_INFO_FIELD_AP_UAPSD(_pStart) LE_BITS_TO_1BYTE(_pStart, 7, 1) #define GET_WMM_QOS_INFO_FIELD_AP_UAPSD(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_AP_UAPSD(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 7, 1, _val) LE_BITS_TO_1BYTE(_pStart, 7, 1)
#define SET_WMM_QOS_INFO_FIELD_AP_UAPSD(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 7, 1, _val)
#define GET_WMM_QOS_INFO_FIELD_STA_AC_VO_UAPSD(_pStart) LE_BITS_TO_1BYTE(_pStart, 0, 1) #define GET_WMM_QOS_INFO_FIELD_STA_AC_VO_UAPSD(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_STA_AC_VO_UAPSD(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 0, 1, _val) LE_BITS_TO_1BYTE(_pStart, 0, 1)
#define SET_WMM_QOS_INFO_FIELD_STA_AC_VO_UAPSD(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 0, 1, _val)
#define GET_WMM_QOS_INFO_FIELD_STA_AC_VI_UAPSD(_pStart) LE_BITS_TO_1BYTE(_pStart, 1, 1) #define GET_WMM_QOS_INFO_FIELD_STA_AC_VI_UAPSD(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_STA_AC_VI_UAPSD(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 1, 1, _val) LE_BITS_TO_1BYTE(_pStart, 1, 1)
#define SET_WMM_QOS_INFO_FIELD_STA_AC_VI_UAPSD(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 1, 1, _val)
#define GET_WMM_QOS_INFO_FIELD_STA_AC_BE_UAPSD(_pStart) LE_BITS_TO_1BYTE(_pStart, 2, 1) #define GET_WMM_QOS_INFO_FIELD_STA_AC_BE_UAPSD(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_STA_AC_BE_UAPSD(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 2, 1, _val) LE_BITS_TO_1BYTE(_pStart, 2, 1)
#define SET_WMM_QOS_INFO_FIELD_STA_AC_BE_UAPSD(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 2, 1, _val)
#define GET_WMM_QOS_INFO_FIELD_STA_AC_BK_UAPSD(_pStart) LE_BITS_TO_1BYTE(_pStart, 3, 1) #define GET_WMM_QOS_INFO_FIELD_STA_AC_BK_UAPSD(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_STA_AC_BK_UAPSD(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 3, 1, _val) LE_BITS_TO_1BYTE(_pStart, 3, 1)
#define SET_WMM_QOS_INFO_FIELD_STA_AC_BK_UAPSD(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 3, 1, _val)
#define GET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart) LE_BITS_TO_1BYTE(_pStart, 5, 2) #define GET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart) \
#define SET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 5, 2, _val) LE_BITS_TO_1BYTE(_pStart, 5, 2)
#define SET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart, _val) \
SET_BITS_TO_LE_1BYTE(_pStart, 5, 2, _val)
enum qos_ie_source { enum qos_ie_source {
QOSIE_SRC_ADDTSREQ, QOSIE_SRC_ADDTSREQ,
...@@ -186,26 +201,40 @@ enum qos_ie_source { ...@@ -186,26 +201,40 @@ enum qos_ie_source {
#define AC_PARAM_SIZE 4 #define AC_PARAM_SIZE 4
#define GET_WMM_AC_PARAM_AIFSN(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 0, 4) ) #define GET_WMM_AC_PARAM_AIFSN(_pStart) \
#define SET_WMM_AC_PARAM_AIFSN(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 0, 4, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 0, 4))
#define SET_WMM_AC_PARAM_AIFSN(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 0, 4, _val)
#define GET_WMM_AC_PARAM_ACM(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 4, 1) ) #define GET_WMM_AC_PARAM_ACM(_pStart) \
#define SET_WMM_AC_PARAM_ACM(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 4, 1, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 4, 1))
#define SET_WMM_AC_PARAM_ACM(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 4, 1, _val)
#define GET_WMM_AC_PARAM_ACI(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 5, 2) ) #define GET_WMM_AC_PARAM_ACI(_pStart) \
#define SET_WMM_AC_PARAM_ACI(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 5, 2, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 5, 2))
#define SET_WMM_AC_PARAM_ACI(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 5, 2, _val)
#define GET_WMM_AC_PARAM_ACI_AIFSN(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 0, 8) ) #define GET_WMM_AC_PARAM_ACI_AIFSN(_pStart) \
#define SET_WMM_AC_PARAM_ACI_AIFSN(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 0, 8, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 0, 8))
#define SET_WMM_AC_PARAM_ACI_AIFSN(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 0, 8, _val)
#define GET_WMM_AC_PARAM_ECWMIN(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 8, 4) ) #define GET_WMM_AC_PARAM_ECWMIN(_pStart) \
#define SET_WMM_AC_PARAM_ECWMIN(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 8, 4, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 8, 4))
#define SET_WMM_AC_PARAM_ECWMIN(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 8, 4, _val)
#define GET_WMM_AC_PARAM_ECWMAX(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 12, 4) ) #define GET_WMM_AC_PARAM_ECWMAX(_pStart) \
#define SET_WMM_AC_PARAM_ECWMAX(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 12, 4, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 12, 4))
#define SET_WMM_AC_PARAM_ECWMAX(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 12, 4, _val)
#define GET_WMM_AC_PARAM_TXOP_LIMIT(_pStart) ( (u8)LE_BITS_TO_4BYTE(_pStart, 16, 16) ) #define GET_WMM_AC_PARAM_TXOP_LIMIT(_pStart) \
#define SET_WMM_AC_PARAM_TXOP_LIMIT(_pStart, _val) SET_BITS_TO_LE_4BYTE(_pStart, 16, 16, _val) ((u8)LE_BITS_TO_4BYTE(_pStart, 16, 16))
#define SET_WMM_AC_PARAM_TXOP_LIMIT(_pStart, _val) \
SET_BITS_TO_LE_4BYTE(_pStart, 16, 16, _val)
...@@ -255,13 +284,13 @@ struct acm { ...@@ -255,13 +284,13 @@ struct acm {
union qos_tclas { union qos_tclas {
struct _TYPE_GENERAL{ struct _TYPE_GENERAL {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
u8 Mask; u8 Mask;
} TYPE_GENERAL; } TYPE_GENERAL;
struct _TYPE0_ETH{ struct _TYPE0_ETH {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
u8 Mask; u8 Mask;
...@@ -270,7 +299,7 @@ union qos_tclas { ...@@ -270,7 +299,7 @@ union qos_tclas {
u16 Type; u16 Type;
} TYPE0_ETH; } TYPE0_ETH;
struct _TYPE1_IPV4{ struct _TYPE1_IPV4 {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
u8 Mask; u8 Mask;
...@@ -284,7 +313,7 @@ union qos_tclas { ...@@ -284,7 +313,7 @@ union qos_tclas {
u8 Reserved; u8 Reserved;
} TYPE1_IPV4; } TYPE1_IPV4;
struct _TYPE1_IPV6{ struct _TYPE1_IPV6 {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
u8 Mask; u8 Mask;
...@@ -296,7 +325,7 @@ union qos_tclas { ...@@ -296,7 +325,7 @@ union qos_tclas {
u8 FlowLabel[3]; u8 FlowLabel[3];
} TYPE1_IPV6; } TYPE1_IPV6;
struct _TYPE2_8021Q{ struct _TYPE2_8021Q {
u8 Priority; u8 Priority;
u8 ClassifierType; u8 ClassifierType;
u8 Mask; u8 Mask;
...@@ -318,7 +347,7 @@ struct qos_tstream { ...@@ -318,7 +347,7 @@ struct qos_tstream {
struct sta_qos { struct sta_qos {
u8 WMMIEBuf[MAX_WMMELE_LENGTH]; u8 WMMIEBuf[MAX_WMMELE_LENGTH];
u8* WMMIE; u8 *WMMIE;
QOS_MODE QosCapability; QOS_MODE QosCapability;
QOS_MODE CurrentQosMode; QOS_MODE CurrentQosMode;
...@@ -329,7 +358,7 @@ struct sta_qos { ...@@ -329,7 +358,7 @@ struct sta_qos {
u8 MaxSPLength; u8 MaxSPLength;
int NumBcnBeforeTrigger; int NumBcnBeforeTrigger;
u8 * pWMMInfoEle; u8 *pWMMInfoEle;
u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE]; u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
struct acm acm[4]; struct acm acm[4];
...@@ -348,66 +377,68 @@ struct sta_qos { ...@@ -348,66 +377,68 @@ struct sta_qos {
}; };
#define QBSS_LOAD_SIZE 5 #define QBSS_LOAD_SIZE 5
#define GET_QBSS_LOAD_STA_COUNT(__pStart) ReadEF2Byte(__pStart) #define GET_QBSS_LOAD_STA_COUNT(__pStart) \
#define SET_QBSS_LOAD_STA_COUNT(__pStart, __Value) WriteEF2Byte(__pStart, __Value) ReadEF2Byte(__pStart)
#define GET_QBSS_LOAD_CHNL_UTILIZATION(__pStart) ReadEF1Byte((u8*)(__pStart) + 2) #define SET_QBSS_LOAD_STA_COUNT(__pStart, __Value) \
#define SET_QBSS_LOAD_CHNL_UTILIZATION(__pStart, __Value) WriteEF1Byte((u8*)(__pStart) + 2, __Value) WriteEF2Byte(__pStart, __Value)
#define GET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart) ReadEF2Byte((u8*)(__pStart) + 3) #define GET_QBSS_LOAD_CHNL_UTILIZATION(__pStart) \
#define SET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart, __Value) WriteEF2Byte((u8*)(__pStart) + 3, __Value) ReadEF1Byte((u8 *)(__pStart) + 2)
#define SET_QBSS_LOAD_CHNL_UTILIZATION(__pStart, __Value) \
WriteEF1Byte((u8 *)(__pStart) + 2, __Value)
#define GET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart) \
ReadEF2Byte((u8 *)(__pStart) + 3)
#define SET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart, __Value) \
WriteEF2Byte((u8 *)(__pStart) + 3, __Value)
struct bss_qos { struct bss_qos {
QOS_MODE bdQoSMode; QOS_MODE bdQoSMode;
u8 bdWMMIEBuf[MAX_WMMELE_LENGTH]; u8 bdWMMIEBuf[MAX_WMMELE_LENGTH];
struct octet_string bdWMMIE; struct octet_string bdWMMIE;
enum qos_ele_subtype EleSubType; enum qos_ele_subtype EleSubType;
u8* pWMMInfoEle; u8 *pWMMInfoEle;
u8* pWMMParamEle; u8 *pWMMParamEle;
u8 QBssLoad[QBSS_LOAD_SIZE]; u8 QBssLoad[QBSS_LOAD_SIZE];
bool bQBssLoadValid; bool bQBssLoadValid;
}; };
#define sQoSCtlLng 2 #define sQoSCtlLng 2
#define QOS_CTRL_LEN(_QosMode) ( (_QosMode > QOS_DISABLE)? sQoSCtlLng : 0 ) #define QOS_CTRL_LEN(_QosMode) ((_QosMode > QOS_DISABLE) ? sQoSCtlLng : 0)
#define IsACValid(ac) ( ( ac>=0 && ac<=7 )? true : false ) #define IsACValid(ac) ((ac >= 0 && ac <= 7) ? true : false)
union aci_aifsn { union aci_aifsn {
u8 charData; u8 charData;
struct struct {
{
u8 AIFSN:4; u8 AIFSN:4;
u8 acm:1; u8 acm:1;
u8 ACI:2; u8 ACI:2;
u8 Reserved:1; u8 Reserved:1;
}f; } f;
}; };
union ecw { union ecw {
u8 charData; u8 charData;
struct struct {
{
u8 ECWmin:4; u8 ECWmin:4;
u8 ECWmax:4; u8 ECWmax:4;
}f; } f;
}; };
union ac_param { union ac_param {
u32 longData; u32 longData;
u8 charData[4]; u8 charData[4];
struct struct {
{
union aci_aifsn AciAifsn; union aci_aifsn AciAifsn;
union ecw Ecw; union ecw Ecw;
u16 TXOPLimit; u16 TXOPLimit;
}f; } f;
}; };
#endif #endif
drivers/staging/rtl8192e/rtl819x_TS.h
View file @ f88ec6cb
...@@ -67,5 +67,7 @@ struct rx_ts_record { ...@@ -67,5 +67,7 @@ struct rx_ts_record {
u8 num; u8 num;
}; };
void _setup_timer(struct timer_list *, void *, unsigned long);
#endif #endif
drivers/staging/rtl8192e/rtl819x_TSProc.c
View file @ f88ec6cb
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7