From df784260dea06e1b2ac27bf9d10522f971c75d21 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sun, 23 Sep 2012 23:07:11 -0400
Subject: [PATCH] --- yaml --- r: 325515 b: refs/heads/master c:
 ec5bb992648881f1721a555f9a4652e60e17880f h: refs/heads/master i:   325513:
 f1dd904668757809e9ed6713e276a5b5c89c695f   325511:
 8f5fd3147715d32c2cb31b8d8c4964cf2ba71982 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/bcm/CmHost.c                   | 4 ++--
 trunk/drivers/staging/bcm/cntrl_SignalingInterface.h | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9aa528a622d7..0269db550e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de473db168ad279fbae5419f03ce0797637ca6df
+refs/heads/master: ec5bb992648881f1721a555f9a4652e60e17880f
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
index 1d1f55067029..fd2780d41e9a 100644
--- a/trunk/drivers/staging/bcm/CmHost.c
+++ b/trunk/drivers/staging/bcm/CmHost.c
@@ -1335,7 +1335,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
 {
 	stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
 	stLocalSFAddIndication *pstAddIndication = NULL;
-	stLocalSFDeleteRequest *pstDeletionRequest;
+	struct bcm_del_request *pstDeletionRequest;
 	UINT uiSearchRuleIndex;
 	ULONG ulSFID;
 
@@ -1346,7 +1346,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
 	 * we can stop the further classifying the pkt for this SF.
 	 */
 	if (pstAddIndicationAlt->u8Type == DSD_REQ) {
-		pstDeletionRequest = (stLocalSFDeleteRequest *)pvBuffer;
+		pstDeletionRequest = (struct bcm_del_request *)pvBuffer;
 
 		ulSFID = ntohl(pstDeletionRequest->u32SFID);
 		uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
index a2e1bf560dbb..0f9ecc04688d 100644
--- a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -312,16 +312,13 @@ typedef struct _stLocalSFAddIndication stLocalSFChangeRequest, *pstLocalSFChange
  */
 typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication;
 
-/*
- * structure stLocalSFDeleteRequest
- */
-typedef struct _stLocalSFDeleteRequest {
+struct bcm_del_request {
 	B_UINT8 u8Type; /* < Type */
 	B_UINT8 u8Padding; /* < Padding byte */
 	B_UINT16 u16TID; /* < TID */
 	/* brief 32bitSFID */
 	B_UINT32 u32SFID; /* < SFID */
-} stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
+};
 
 struct bcm_del_indication {
 	B_UINT8 u8Type;	/* < Type */