diff options
author | Kevin McKinney <klmckinney1@gmail.com> | 2012-09-23 23:07:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 12:31:51 -0400 |
commit | de473db168ad279fbae5419f03ce0797637ca6df (patch) | |
tree | 0b70a2468748f086173455bd3036f64e256fd0a1 | |
parent | 53176607a470092ad62a2268860308f441e493cd (diff) |
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 <klmckinney1@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/bcm/CmHost.c | 8 | ||||
-rw-r--r-- | 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, /* <Pointer | |||
1856 | UINT uiSearchRuleIndex; | 1856 | UINT uiSearchRuleIndex; |
1857 | ULONG ulSFID; | 1857 | ULONG ulSFID; |
1858 | 1858 | ||
1859 | pLeader->PLength = sizeof(stLocalSFDeleteIndication); | 1859 | pLeader->PLength = sizeof(struct bcm_del_indication); |
1860 | *((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((stLocalSFDeleteIndication *)pstAddIndication); | 1860 | *((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication *)pstAddIndication); |
1861 | 1861 | ||
1862 | ulSFID = ntohl(((stLocalSFDeleteIndication *)pstAddIndication)->u32SFID); | 1862 | ulSFID = ntohl(((struct bcm_del_indication *)pstAddIndication)->u32SFID); |
1863 | uiSearchRuleIndex = SearchSfid(Adapter, ulSFID); | 1863 | uiSearchRuleIndex = SearchSfid(Adapter, ulSFID); |
1864 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD - Removing connection %x", uiSearchRuleIndex); | 1864 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD - Removing connection %x", uiSearchRuleIndex); |
1865 | 1865 | ||
@@ -1870,7 +1870,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer | |||
1870 | } | 1870 | } |
1871 | 1871 | ||
1872 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC"); | 1872 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC"); |
1873 | ((stLocalSFDeleteIndication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP; | 1873 | ((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP; |
1874 | CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); | 1874 | CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); |
1875 | } | 1875 | } |
1876 | case DSD_RSP: | 1876 | 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 { | |||
323 | B_UINT32 u32SFID; /* < SFID */ | 323 | B_UINT32 u32SFID; /* < SFID */ |
324 | } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest; | 324 | } stLocalSFDeleteRequest, *pstLocalSFDeleteRequest; |
325 | 325 | ||
326 | /* | 326 | struct bcm_del_indication { |
327 | * structure stLocalSFDeleteIndication | ||
328 | */ | ||
329 | typedef struct stLocalSFDeleteIndication { | ||
330 | B_UINT8 u8Type; /* < Type */ | 327 | B_UINT8 u8Type; /* < Type */ |
331 | B_UINT8 u8Padding; /* < Padding */ | 328 | B_UINT8 u8Padding; /* < Padding */ |
332 | B_UINT16 u16TID; /* < TID */ | 329 | B_UINT16 u16TID; /* < TID */ |
@@ -339,7 +336,7 @@ typedef struct stLocalSFDeleteIndication { | |||
339 | /* brief 8bit Confirmation code */ | 336 | /* brief 8bit Confirmation code */ |
340 | B_UINT8 u8ConfirmationCode; /* < Confirmation code */ | 337 | B_UINT8 u8ConfirmationCode; /* < Confirmation code */ |
341 | B_UINT8 u8Padding1[3]; /* < 3 byte Padding */ | 338 | B_UINT8 u8Padding1[3]; /* < 3 byte Padding */ |
342 | } stLocalSFDeleteIndication; | 339 | }; |
343 | 340 | ||
344 | struct bcm_stim_sfhostnotify { | 341 | struct bcm_stim_sfhostnotify { |
345 | B_UINT32 SFID; /* SFID of the service flow */ | 342 | B_UINT32 SFID; /* SFID of the service flow */ |