From 3a78076a5134b206383504033f46ea5086f13bfc Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sun, 23 Sep 2012 23:07:13 -0400 Subject: [PATCH] --- yaml --- r: 325517 b: refs/heads/master c: fc1ad16277bd14c6a4f16a2e32cae186fd6d039e h: refs/heads/master i: 325515: df784260dea06e1b2ac27bf9d10522f971c75d21 v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/CmHost.c | 6 +++--- trunk/drivers/staging/bcm/cntrl_SignalingInterface.h | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 99eea302e8db..9af17c821975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da529f0ffb03b90f8d6a462f2681e72f4da7032a +refs/heads/master: fc1ad16277bd14c6a4f16a2e32cae186fd6d039e diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c index e1a93481562d..96fd1586f085 100644 --- a/trunk/drivers/staging/bcm/CmHost.c +++ b/trunk/drivers/staging/bcm/CmHost.c @@ -1387,7 +1387,7 @@ 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; @@ -1395,8 +1395,8 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu 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; } diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h index fbdc2316d997..43d462e59088 100644 --- a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/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 */