---

yaml --- r: 325514 b: refs/heads/master c: de473db h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · ff25414 · ff25414
1 parent f1dd904
commit ff25414
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53176607a470092ad62a2268860308f441e493cd
+refs/heads/master: de473db168ad279fbae5419f03ce0797637ca6df
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
@@ -1856,10 +1856,10 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
 		UINT uiSearchRuleIndex;
 		ULONG ulSFID;
 
-		pLeader->PLength = sizeof(stLocalSFDeleteIndication);
-		*((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((stLocalSFDeleteIndication *)pstAddIndication);
+		pLeader->PLength = sizeof(struct bcm_del_indication);
+		*((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication *)pstAddIndication);
 
-		ulSFID = ntohl(((stLocalSFDeleteIndication *)pstAddIndication)->u32SFID);
+		ulSFID = ntohl(((struct bcm_del_indication *)pstAddIndication)->u32SFID);
 		uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD - Removing connection %x", uiSearchRuleIndex);
 
@@ -1870,7 +1870,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
 		}
 
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC");
-		((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
+		((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
 		CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
 	}
 	case DSD_RSP:

diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -323,10 +323,7 @@ typedef struct _stLocalSFDeleteRequest {
 	B_UINT32 u32SFID; /* < SFID */
 } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
 
-/*
- * structure stLocalSFDeleteIndication
- */
-typedef struct stLocalSFDeleteIndication {
+struct bcm_del_indication {
 	B_UINT8 u8Type;	/* < Type */
 	B_UINT8 u8Padding; /* < Padding */
 	B_UINT16 u16TID; /* < TID */
@@ -339,7 +336,7 @@ typedef struct stLocalSFDeleteIndication {
 	/* brief 8bit Confirmation code */
 	B_UINT8 u8ConfirmationCode; /* < Confirmation code */
 	B_UINT8 u8Padding1[3]; /* < 3 byte Padding */
-} stLocalSFDeleteIndication;
+};
 
 struct bcm_stim_sfhostnotify {
 	B_UINT32 SFID; /* SFID of the service flow */