From de473db168ad279fbae5419f03ce0797637ca6df Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sun, 23 Sep 2012 23:07:10 -0400 Subject: [PATCH] Staging: bcm: Remove typedef for stLocalSFDeleteIndication and call directly. This patch removes typedef for stLocalSFDeleteIndication, and changes the name of the struct to bcm_del_indication. In addition, any calls to the following typedef "stLocalSFDeleteIndication" are changed to call the struct directly. Signed-off-by: Kevin McKinney Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/CmHost.c | 8 ++++---- drivers/staging/bcm/cntrl_SignalingInterface.h | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 25aa20aad65e..1d1f55067029 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -1856,10 +1856,10 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* 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, /* 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/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h index 11b3181d537a..a2e1bf560dbb 100644 --- a/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/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 */ -- 2.39.5