---

yaml
---
r: 325517
b: refs/heads/master
c: fc1ad16
h: refs/heads/master
i:
  325515: df78426
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da529f0ffb03b90f8d6a462f2681e72f4da7032a
+refs/heads/master: fc1ad16277bd14c6a4f16a2e32cae186fd6d039e

trunk/drivers/staging/bcm/CmHost.c

@@ -1387,16 +1387,16 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
 	pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
 
 	if (pstAddIndicationAlt->u8Type == DSA_REQ) {
-		stLocalSFAddRequest AddRequest;
+		struct bcm_add_request AddRequest;
 
 		AddRequest.u8Type = pstAddIndicationAlt->u8Type;
 		AddRequest.eConnectionDir = pstAddIndicationAlt->u8Direction;
 		AddRequest.u16TID = pstAddIndicationAlt->u16TID;
 		AddRequest.u16CID = pstAddIndicationAlt->u16CID;
 		AddRequest.u16VCID = pstAddIndicationAlt->u16VCID;
 		AddRequest.psfParameterSet = pstAddIndication->psfAuthorizedSet;
-		(*puBufferLength) = sizeof(stLocalSFAddRequest);
-		memcpy(pvBuffer, &AddRequest, sizeof(stLocalSFAddRequest));
+		(*puBufferLength) = sizeof(struct bcm_add_request);
+		memcpy(pvBuffer, &AddRequest, sizeof(struct bcm_add_request));
 		kfree(pstAddIndication);
 		return 1;
 	}

trunk/drivers/staging/bcm/cntrl_SignalingInterface.h

@@ -260,10 +260,7 @@ typedef struct _stServiceFlowParamSI {
 } stServiceFlowParamSI, *pstServiceFlowParamSI;
 typedef stServiceFlowParamSI CServiceFlowParamSI;
 
-/*
- * structure stLocalSFAddRequest
- */
-typedef struct _stLocalSFAddRequest {
+struct bcm_add_request {
 	B_UINT8 u8Type;	/* < Type */
 	B_UINT8 eConnectionDir; /* < Connection direction */
 	/* brief 16 bit TID */
@@ -274,8 +271,7 @@ typedef struct _stLocalSFAddRequest {
 	B_UINT16 u16VCID; /* < 16bit VCID */
 	/* brief structure ParameterSet */
 	stServiceFlowParamSI *psfParameterSet; /* < structure ParameterSet */
-
-} stLocalSFAddRequest, *pstLocalSFAddRequest;
+};
 
 struct bcm_add_indication {
 	B_UINT8 u8Type;	/* < Type */