Commit 5fa9ac45 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

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

This patch removes typedef for _S_ETHCS_PKT_INFO, and
changes the name of the struct to bcm_eth_packet_info.
In addition, any calls to struct "S_ETHCS_PKT_INFO, or
*PS_ETHCS_PKT_INFO" are changed to call directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1b37925
...@@ -37,12 +37,12 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE { ...@@ -37,12 +37,12 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE {
eEthOtherFrame eEthOtherFrame
} E_NWPKT_ETHFRAME_TYPE; } E_NWPKT_ETHFRAME_TYPE;
typedef struct _S_ETHCS_PKT_INFO { struct bcm_eth_packet_info {
E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType; E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType; E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
unsigned short usEtherType; unsigned short usEtherType;
unsigned char ucDSAP; unsigned char ucDSAP;
} S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO; };
struct bcm_eth_q_frame { struct bcm_eth_q_frame {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;
......
...@@ -4,8 +4,8 @@ This file contains the routines related to Quality of Service. ...@@ -4,8 +4,8 @@ This file contains the routines related to Quality of Service.
*/ */
#include "headers.h" #include "headers.h"
static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo); static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo);
static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo,struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport);
static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd, static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd,
struct bcm_classifier_rule *pstClassifierRule ); struct bcm_classifier_rule *pstClassifierRule );
...@@ -446,7 +446,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) ...@@ -446,7 +446,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
{ {
INT uiLoopIndex=0; INT uiLoopIndex=0;
struct bcm_classifier_rule *pstClassifierRule = NULL; struct bcm_classifier_rule *pstClassifierRule = NULL;
S_ETHCS_PKT_INFO stEthCsPktInfo; struct bcm_eth_packet_info stEthCsPktInfo;
PVOID pvEThPayload = NULL; PVOID pvEThPayload = NULL;
struct iphdr *pIpHeader = NULL; struct iphdr *pIpHeader = NULL;
INT uiSfIndex=0; INT uiSfIndex=0;
...@@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie ...@@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie
return TRUE; return TRUE;
} }
static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo) static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo)
{ {
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
if((pstClassifierRule->ucEtherTypeLen==0)|| if((pstClassifierRule->ucEtherTypeLen==0)||
...@@ -718,7 +718,7 @@ static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRul ...@@ -718,7 +718,7 @@ static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRul
} }
static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo) static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo)
{ {
BOOLEAN bClassificationSucceed = FALSE; BOOLEAN bClassificationSucceed = FALSE;
USHORT usVLANID; USHORT usVLANID;
...@@ -769,7 +769,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule ...@@ -769,7 +769,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule
static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb, static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb,
PS_ETHCS_PKT_INFO pstEthCsPktInfo, struct bcm_eth_packet_info *pstEthCsPktInfo,
struct bcm_classifier_rule *pstClassifierRule, struct bcm_classifier_rule *pstClassifierRule,
B_UINT8 EthCSCupport) B_UINT8 EthCSCupport)
{ {
...@@ -802,7 +802,7 @@ static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* ...@@ -802,7 +802,7 @@ static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff*
} }
static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
PS_ETHCS_PKT_INFO pstEthCsPktInfo) struct bcm_eth_packet_info *pstEthCsPktInfo)
{ {
USHORT u16Etype = ntohs(((struct bcm_eth_header *)pvEthPayload)->u16Etype); USHORT u16Etype = ntohs(((struct bcm_eth_header *)pvEthPayload)->u16Etype);
......
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