Staging: bcm: Remove typedef for _S_CLASSIFIER_RULE and call directly. (92562aee) · Commits · e / devices / android_kernel_teracube_2e

drivers/staging/bcm/Adapter.h

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,7 @@ typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {
	UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */		UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
	} S_HDR_SUPRESSION_CONTEXTINFO;		} S_HDR_SUPRESSION_CONTEXTINFO;

	typedef struct _S_CLASSIFIER_RULE {		struct bcm_classifier_rule {
	ULONG ulSFID;		ULONG ulSFID;
	UCHAR ucReserved[2];		UCHAR ucReserved[2];
	B_UINT16 uiClassifierRuleIndex;		B_UINT16 uiClassifierRuleIndex;
	@@ -156,14 +156,13 @@ typedef struct _S_CLASSIFIER_RULE {
	UCHAR usUserPriority[2];		UCHAR usUserPriority[2];
	USHORT usVLANID;		USHORT usVLANID;
	USHORT usValidityBitMap;		USHORT usValidityBitMap;
	} S_CLASSIFIER_RULE;		};
	/* typedef struct _S_CLASSIFIER_RULE S_CLASSIFIER_RULE; */

	struct bcm_fragmented_packet_info {		struct bcm_fragmented_packet_info {
	BOOLEAN bUsed;		BOOLEAN bUsed;
	ULONG ulSrcIpAddress;		ULONG ulSrcIpAddress;
	USHORT usIpIdentification;		USHORT usIpIdentification;
	S_CLASSIFIER_RULE *pstMatchedClassifierEntry;		struct bcm_classifier_rule *pstMatchedClassifierEntry;
	BOOLEAN bOutOfOrderFragment;		BOOLEAN bOutOfOrderFragment;
	};		};

	@@ -295,7 +294,7 @@ struct _MINI_ADAPTER {
	USHORT CurrNumRecvDescs;		USHORT CurrNumRecvDescs;
	UINT u32TotalDSD;		UINT u32TotalDSD;
	struct bcm_packet_info PackInfo[NO_OF_QUEUES];		struct bcm_packet_info PackInfo[NO_OF_QUEUES];
	S_CLASSIFIER_RULE astClassifierTable[MAX_CLASSIFIERS];		struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
	BOOLEAN TransferMode;		BOOLEAN TransferMode;

	/************* qos ****************/		/************* qos ****************/

drivers/staging/bcm/CmHost.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -112,7 +112,7 @@ static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
	}		}

	static inline VOID		static inline VOID
	CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry,		CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
	B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,		B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,
	BOOLEAN bIpVersion6, E_IPADDR_CONTEXT eIpAddrContext)		BOOLEAN bIpVersion6, E_IPADDR_CONTEXT eIpAddrContext)
	{		{
	@@ -238,7 +238,7 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
	*/		*/
	static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)		static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
	{		{
	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;		struct bcm_classifier_rule *pstClassifierEntry = NULL;
	/* VOID pvPhsContext = NULL; /		/* VOID pvPhsContext = NULL; /
	int i;		int i;
	/* UCHAR ucProtocolLength=0; */		/* UCHAR ucProtocolLength=0; */
	@@ -367,7 +367,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
	*/		*/
	static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)		static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
	{		{
	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;		struct bcm_classifier_rule *pstClassifierEntry = NULL;
	B_UINT16 u16PacketClassificationRuleIndex;		B_UINT16 u16PacketClassificationRuleIndex;
	USHORT usVCID;		USHORT usVCID;
	/* VOID pvPhsContext = NULL; /		/* VOID pvPhsContext = NULL; /
	@@ -386,7 +386,7 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear
	if (pstClassifierEntry) {		if (pstClassifierEntry) {
	pstClassifierEntry->bUsed = FALSE;		pstClassifierEntry->bUsed = FALSE;
	pstClassifierEntry->uiClassifierRuleIndex = 0;		pstClassifierEntry->uiClassifierRuleIndex = 0;
	memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_RULE));		memset(pstClassifierEntry, 0, sizeof(struct bcm_classifier_rule));

	/* Delete the PHS Rule for this classifier */		/* Delete the PHS Rule for this classifier */
	PhsDeleteClassifierRule(&Adapter->stBCMPhsContext, usVCID, u16PacketClassificationRuleIndex);		PhsDeleteClassifierRule(&Adapter->stBCMPhsContext, usVCID, u16PacketClassificationRuleIndex);
	@@ -398,7 +398,7 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear
	*/		*/
	VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)		VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
	{		{
	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;		struct bcm_classifier_rule *pstClassifierEntry = NULL;
	int i;		int i;
	/* B_UINT16 u16PacketClassificationRuleIndex; */		/* B_UINT16 u16PacketClassificationRuleIndex; */
	USHORT ulVCID;		USHORT ulVCID;

drivers/staging/bcm/IPv6Protocol.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	#include "headers.h"		#include "headers.h"

	static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,		static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
	IPV6Header *pstIpv6Header);		IPV6Header *pstIpv6Header);
	static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,		static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
	IPV6Header *pstIpv6Header);		IPV6Header *pstIpv6Header);
	static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);		static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);

	@@ -181,7 +181,7 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR pucPayload, USHORT pusSrcPort,
	* Arg 2 PVOID pcIpHeader is a pointer to the IP header of the packet		* Arg 2 PVOID pcIpHeader is a pointer to the IP header of the packet
	*/		*/
	USHORT IpVersion6(PMINI_ADAPTER Adapter, PVOID pcIpHeader,		USHORT IpVersion6(PMINI_ADAPTER Adapter, PVOID pcIpHeader,
	S_CLASSIFIER_RULE *pstClassifierRule)		struct bcm_classifier_rule *pstClassifierRule)
	{		{
	USHORT ushDestPort = 0;		USHORT ushDestPort = 0;
	USHORT ushSrcPort = 0;		USHORT ushSrcPort = 0;
	@@ -288,7 +288,7 @@ USHORT IpVersion6(PMINI_ADAPTER Adapter, PVOID pcIpHeader,
	}		}


	static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,		static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
	IPV6Header *pstIpv6Header)		IPV6Header *pstIpv6Header)
	{		{
	UINT uiLoopIndex = 0;		UINT uiLoopIndex = 0;
	@@ -344,7 +344,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,
	return FALSE;		return FALSE;
	}		}

	static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,		static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
	IPV6Header *pstIpv6Header)		IPV6Header *pstIpv6Header)
	{		{
	UINT uiLoopIndex = 0;		UINT uiLoopIndex = 0;

drivers/staging/bcm/IPv6ProtocolHdr.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -104,13 +104,13 @@ typedef enum _E_IPADDR_CONTEXT

	USHORT IpVersion6(PMINI_ADAPTER Adapter, /*< Pointer to the driver control structure /		USHORT IpVersion6(PMINI_ADAPTER Adapter, /*< Pointer to the driver control structure /
	PVOID pcIpHeader, /*<Pointer to the IP Hdr of the packet/		PVOID pcIpHeader, /*<Pointer to the IP Hdr of the packet/
	S_CLASSIFIER_RULE *pstClassifierRule );		struct bcm_classifier_rule *pstClassifierRule );

	VOID DumpIpv6Address(ULONG *puIpv6Address);		VOID DumpIpv6Address(ULONG *puIpv6Address);

	extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);		extern BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
	extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);		extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
	extern BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol);		extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol);


	#endif		#endif

drivers/staging/bcm/Misc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -684,7 +684,7 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
	UINT uiLoopIndex = 0;		UINT uiLoopIndex = 0;
	UINT uiIndex = 0;		UINT uiIndex = 0;
	UINT uiClsfrIndex = 0;		UINT uiClsfrIndex = 0;
	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;		struct bcm_classifier_rule *pstClassifierEntry = NULL;

	for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {		for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "********* Showing Details Of Queue %d* ****", uiLoopIndex);		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "********* Showing Details Of Queue %d* ****", uiLoopIndex);
	@@ -1519,7 +1519,7 @@ VOID ResetCounters(PMINI_ADAPTER Adapter)
	Adapter->bShutStatus = FALSE;		Adapter->bShutStatus = FALSE;
	}		}

	S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG SrcIP)		struct bcm_classifier_rule *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG SrcIP)
	{		{
	UINT uiIndex = 0;		UINT uiIndex = 0;
	for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {		for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {