From 4b0cb3cb3bf96fd22bc9c5b0de5a3751f18e8fb6 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sun, 23 Sep 2012 23:07:17 -0400 Subject: [PATCH] Staging: bcm: Remove typedef for _stCPacketClassificationRuleSI and call directly. This patch removes typedef for _stCPacketClassificationRuleSI, changes the name of the struct to bcm_packet_class_rules, and updates the comments appropriately . In addition, any calls to typedefs "CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, or *pstCPacketClassificationRuleSI" are changed to call the struct directly. Signed-off-by: Kevin McKinney Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/cntrl_SignalingInterface.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h index f67cb6e2eaa7..990e809e9680 100644 --- a/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/drivers/staging/bcm/cntrl_SignalingInterface.h @@ -34,12 +34,7 @@ #define NUM_ETHERTYPE_BYTES 3 #define NUM_IPV6_FLOWLABLE_BYTES 3 -/* - * structure Definitions - * - * brief class cCPacketClassificationRule - */ -struct _stCPacketClassificationRuleSI { +struct bcm_packet_class_rules { /* 16bit UserPriority Of The Service Flow */ B_UINT16 u16UserPriority; /* 16bit VLANID Of The Service Flow */ @@ -96,7 +91,6 @@ struct _stCPacketClassificationRuleSI { B_UINT8 u8ClassifierActionRule; B_UINT16 u16ValidityBitMap; }; -typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI; struct bcm_phs_rules { /* 8bit PHS Index Of The Service Flow */ @@ -127,8 +121,8 @@ struct bcm_convergence_types { B_UINT8 u8PhsDSCAction; /* 16bit Padding */ B_UINT8 u8Padding[2]; - /* brief class cCPacketClassificationRule */ - stCPacketClassificationRuleSI cCPacketClassificationRule; + /* Packet classification rules structure */ + struct bcm_packet_class_rules cCPacketClassificationRule; /* Payload header suppression rules structure */ struct bcm_phs_rules cPhsRule; };