This patch removes typedef for stLocalSFDeleteIndication, changes the name of the struct to bcm_stlocalsfdelind. In addition, any calls to the following typedef "stLocalSFDeleteIndication" are changed to call the struct directly. Signed-off-by: Kevin McKinney <klmckinney1@xxxxxxxxx> --- drivers/staging/bcm/CmHost.c | 8 ++++---- drivers/staging/bcm/cntrl_SignalingInterface.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 25aa20a..89ebac6 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/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_stlocalsfdelind); + *((struct bcm_stlocalsfdelind *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_stlocalsfdelind *)pstAddIndication); - ulSFID = ntohl(((stLocalSFDeleteIndication *)pstAddIndication)->u32SFID); + ulSFID = ntohl(((struct bcm_stlocalsfdelind *)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_stlocalsfdelind *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP; CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); } case DSD_RSP: diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h index 11b3181..23dc0e6 100644 --- a/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/drivers/staging/bcm/cntrl_SignalingInterface.h @@ -324,9 +324,9 @@ typedef struct _stLocalSFDeleteRequest { } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest; /* - * structure stLocalSFDeleteIndication + * structure bcm_stlocalsfdelind */ -typedef struct stLocalSFDeleteIndication { +struct bcm_stlocalsfdelind { B_UINT8 u8Type; /* < Type */ B_UINT8 u8Padding; /* < Padding */ B_UINT16 u16TID; /* < TID */ @@ -339,7 +339,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 */ -- 1.7.9.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel