---

yaml --- r: 325446 b: refs/heads/master c: f34170c h: refs/heads/master v: v3
git-mirror · Sep 21, 2012 · cf1f16f · cf1f16f
1 parent 8a01db1
commit cf1f16f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db
+refs/heads/master: f34170c762e88512796be7f94df80f294d12de95
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
@@ -1913,7 +1913,7 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId
 VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)
 {
 	B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
-	stIM_SFHostNotify *pHostInfo = NULL;
+	struct bcm_stim_sfhostnotify *pHostInfo = NULL;
 	UINT uiSearchRuleIndex = 0;
 	ULONG ulSFID = 0;
 
@@ -1922,7 +1922,7 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer
 
 	while (u32NumofSFsinMsg != 0 && u32NumofSFsinMsg < NO_OF_QUEUES) {
 		u32NumofSFsinMsg--;
-		pHostInfo = (stIM_SFHostNotify *)puiBuffer;
+		pHostInfo = (struct bcm_stim_sfhostnotify *)puiBuffer;
 		puiBuffer = (PUINT)(pHostInfo + 1);
 
 		ulSFID = ntohl(pHostInfo->SFID);

diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -341,13 +341,13 @@ typedef struct stLocalSFDeleteIndication {
 	B_UINT8 u8Padding1[3]; /* < 3 byte Padding */
 } stLocalSFDeleteIndication;
 
-typedef struct _stIM_SFHostNotify {
+struct bcm_stim_sfhostnotify {
 	B_UINT32 SFID; /* SFID of the service flow */
 	B_UINT16 newCID; /* the new/changed CID */
 	B_UINT16 VCID; /* Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid */
 	B_UINT8 RetainSF; /* Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete */
 	B_UINT8 QoSParamSet; /* QoS paramset of the retained SF */
 	B_UINT16 u16reserved; /* For byte alignment */
-} stIM_SFHostNotify;
+};
 
 #endif