Skip to content

L
linux
Commit 92562aee authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files
Options

Staging: bcm: Remove typedef for _S_CLASSIFIER_RULE and call directly. 

This patch removes typedef for _S_CLASSIFIER_RULE,
changes the name of the struct from
_S_CLASSIFIER_RULE to bcm_classifier_rule.
In addition, any calls to the following typedefs
"S_CLASSIFIER_RULE" are changed to call the
struct directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f22485d
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 43 deletions
drivers/staging/bcm/Adapter.h
View file @ 92562aee
...@@ -105,7 +105,7 @@ typedef struct _S_HDR_SUPRESSION_CONTEXTINFO { ...@@ -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 { ...@@ -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 { ...@@ -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
View file @ 92562aee
...@@ -112,7 +112,7 @@ static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex) ...@@ -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) ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
View file @ 92562aee
#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, ...@@ -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, ...@@ -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, ...@@ -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
View file @ 92562aee
...@@ -104,13 +104,13 @@ typedef enum _E_IPADDR_CONTEXT ...@@ -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
View file @ 92562aee
...@@ -684,7 +684,7 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter) ...@@ -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) ...@@ -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++) {
......
drivers/staging/bcm/Prototypes.h
View file @ 92562aee
...@@ -33,9 +33,9 @@ INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid); ...@@ -33,9 +33,9 @@ INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid);
USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb); USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb);
BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort); BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort); BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol); BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol);
INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
...@@ -101,7 +101,7 @@ VOID ResetCounters(PMINI_ADAPTER Adapter); ...@@ -101,7 +101,7 @@ VOID ResetCounters(PMINI_ADAPTER Adapter);
int InitLedSettings(PMINI_ADAPTER Adapter); int InitLedSettings(PMINI_ADAPTER Adapter);
S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIP); struct bcm_classifier_rule *GetFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIP);
void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo); void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo);
......
drivers/staging/bcm/Qos.c
View file @ 92562aee
...@@ -5,10 +5,10 @@ This file contains the routines related to Quality of Service. ...@@ -5,10 +5,10 @@ This file contains the routines related to Quality of Service.
#include "headers.h" #include "headers.h"
static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo); static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo);
static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport); static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport);
static USHORT IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd, static USHORT IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd,
S_CLASSIFIER_RULE *pstClassifierRule ); struct bcm_classifier_rule *pstClassifierRule );
static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex); static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex);
...@@ -24,7 +24,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex); ...@@ -24,7 +24,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex);
* *
* Returns - TRUE(If address matches) else FAIL . * Returns - TRUE(If address matches) else FAIL .
*********************************************************************/ *********************************************************************/
BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP) BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ulSrcIP)
{ {
UCHAR ucLoopIndex=0; UCHAR ucLoopIndex=0;
...@@ -58,7 +58,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP) ...@@ -58,7 +58,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
* *
* Returns - TRUE(If address matches) else FAIL . * Returns - TRUE(If address matches) else FAIL .
*********************************************************************/ *********************************************************************/
BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP) BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ulDestIP)
{ {
UCHAR ucLoopIndex=0; UCHAR ucLoopIndex=0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -91,7 +91,7 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP) ...@@ -91,7 +91,7 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
* *
* Returns - TRUE(If address matches) else FAIL. * Returns - TRUE(If address matches) else FAIL.
**************************************************************************/ **************************************************************************/
BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService) BOOLEAN MatchTos(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucTypeOfService)
{ {
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -117,7 +117,7 @@ BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService) ...@@ -117,7 +117,7 @@ BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService)
* *
* Returns - TRUE(If address matches) else FAIL. * Returns - TRUE(If address matches) else FAIL.
****************************************************************************/ ****************************************************************************/
BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol) BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol)
{ {
UCHAR ucLoopIndex=0; UCHAR ucLoopIndex=0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -146,7 +146,7 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol) ...@@ -146,7 +146,7 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
* *
* Returns - TRUE(If address matches) else FAIL. * Returns - TRUE(If address matches) else FAIL.
***************************************************************************/ ***************************************************************************/
BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort) BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort)
{ {
UCHAR ucLoopIndex=0; UCHAR ucLoopIndex=0;
...@@ -178,7 +178,7 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort) ...@@ -178,7 +178,7 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
* *
* Returns - TRUE(If address matches) else FAIL. * Returns - TRUE(If address matches) else FAIL.
***************************************************************************/ ***************************************************************************/
BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort) BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushDestPort)
{ {
UCHAR ucLoopIndex=0; UCHAR ucLoopIndex=0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -206,7 +206,7 @@ Compares IPV4 Ip address and port number ...@@ -206,7 +206,7 @@ Compares IPV4 Ip address and port number
*/ */
static USHORT IpVersion4(PMINI_ADAPTER Adapter, static USHORT IpVersion4(PMINI_ADAPTER Adapter,
struct iphdr *iphd, struct iphdr *iphd,
S_CLASSIFIER_RULE *pstClassifierRule ) struct bcm_classifier_rule *pstClassifierRule)
{ {
xporthdr *xprt_hdr=NULL; xporthdr *xprt_hdr=NULL;
BOOLEAN bClassificationSucceed=FALSE; BOOLEAN bClassificationSucceed=FALSE;
...@@ -445,7 +445,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) ...@@ -445,7 +445,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb) USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
{ {
INT uiLoopIndex=0; INT uiLoopIndex=0;
S_CLASSIFIER_RULE *pstClassifierRule = NULL; struct bcm_classifier_rule *pstClassifierRule = NULL;
S_ETHCS_PKT_INFO stEthCsPktInfo; S_ETHCS_PKT_INFO stEthCsPktInfo;
PVOID pvEThPayload = NULL; PVOID pvEThPayload = NULL;
struct iphdr *pIpHeader = NULL; struct iphdr *pIpHeader = NULL;
...@@ -649,7 +649,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb) ...@@ -649,7 +649,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
return INVALID_QUEUE_INDEX; return INVALID_QUEUE_INDEX;
} }
static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCHAR Mac) static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac)
{ {
UINT i=0; UINT i=0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -666,7 +666,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH ...@@ -666,7 +666,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH
return TRUE; return TRUE;
} }
static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCHAR Mac) static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac)
{ {
UINT i=0; UINT i=0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
...@@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC ...@@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC
return TRUE; return TRUE;
} }
static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo) static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo)
{ {
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
if((pstClassifierRule->ucEtherTypeLen==0)|| if((pstClassifierRule->ucEtherTypeLen==0)||
...@@ -718,7 +718,7 @@ static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct ...@@ -718,7 +718,7 @@ static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct
} }
static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo) static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo)
{ {
BOOLEAN bClassificationSucceed = FALSE; BOOLEAN bClassificationSucceed = FALSE;
USHORT usVLANID; USHORT usVLANID;
...@@ -770,7 +770,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s ...@@ -770,7 +770,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb, static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,
PS_ETHCS_PKT_INFO pstEthCsPktInfo, PS_ETHCS_PKT_INFO pstEthCsPktInfo,
S_CLASSIFIER_RULE *pstClassifierRule, struct bcm_classifier_rule *pstClassifierRule,
B_UINT8 EthCSCupport) B_UINT8 EthCSCupport)
{ {
BOOLEAN bClassificationSucceed = FALSE; BOOLEAN bClassificationSucceed = FALSE;
......
drivers/staging/bcm/sort.c
View file @ 92562aee
...@@ -33,8 +33,8 @@ VOID SortPackInfo(PMINI_ADAPTER Adapter) ...@@ -33,8 +33,8 @@ VOID SortPackInfo(PMINI_ADAPTER Adapter)
static int compare_classifiers(void const *a, void const *b) static int compare_classifiers(void const *a, void const *b)
{ {
S_CLASSIFIER_RULE const *pa = a; struct bcm_classifier_rule const *pa = a;
S_CLASSIFIER_RULE const *pb = b; struct bcm_classifier_rule const *pb = b;
if (!pa->bUsed || !pb->bUsed) if (!pa->bUsed || !pb->bUsed)
return 0; return 0;
...@@ -48,5 +48,5 @@ VOID SortClassifiers(PMINI_ADAPTER Adapter) ...@@ -48,5 +48,5 @@ VOID SortClassifiers(PMINI_ADAPTER Adapter)
DBG_LVL_ALL, "<======="); DBG_LVL_ALL, "<=======");
sort(Adapter->astClassifierTable, MAX_CLASSIFIERS, sort(Adapter->astClassifierTable, MAX_CLASSIFIERS,
sizeof(S_CLASSIFIER_RULE), compare_classifiers, NULL); sizeof(struct bcm_classifier_rule), compare_classifiers, NULL);
} }
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