Staging: bcm: Remove typedef for stLocalSFChangeIndicationAlt and call directly.

This patch removes typedef for
stLocalSFChangeIndicationAlt, changes the
name of the struct to bcm_change_indication,
and removes a comment. In addition, any
calls to typedef stLocalSFChangeIndicationAlt
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 48302ee7ebf15291a4ece9d2f56f60d121313ecb..df538386c77e9891bb511ddd4987264d1948ce4d 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1635,7 +1635,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
 {
        struct bcm_connect_mgr_params *psfLocalSet = NULL;
        stLocalSFAddIndicationAlt *pstAddIndication = NULL;
-       stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;
+       struct bcm_change_indication *pstChangeIndication = NULL;
        struct bcm_leader *pLeader = NULL;
 
        /*
@@ -1773,12 +1773,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
        break;
        case DSC_REQ:
        {
-               pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-               pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+               pLeader->PLength = sizeof(struct bcm_change_indication);
+               pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC RESPONSE TO MAC %d", pLeader->PLength);
 
-               *((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-               ((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
+               *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+               ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
 
                CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
                kfree(pstAddIndication);
@@ -1786,17 +1786,17 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
        break;
        case DSC_RSP:
        {
-               pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-               pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+               pLeader->PLength = sizeof(struct bcm_change_indication);
+               pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC ACK TO MAC %d", pLeader->PLength);
-               *((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-               ((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
+               *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+               ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
        }
        case DSC_ACK:
        {
                UINT uiSearchRuleIndex = 0;
 
-               pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+               pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                uiSearchRuleIndex = SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID));
                if (uiSearchRuleIndex > NO_OF_QUEUES-1)
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "SF doesn't exist for which DSC_ACK is received");

diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 7dd05227ca227d8d13e4af91c6bc90d593e93f81..6e79e970069ef765f8b4dec7125101ab59b9b21f 100644 (file)
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -104,8 +104,7 @@ typedef struct stLocalSFChangeConfirmationAlt {
        struct bcm_connect_mgr_params sfActiveSet;
 } stLocalSFChangeConfirmationAlt;
 
-/* brief structure stLocalSFChangeIndication */
-typedef struct stLocalSFChangeIndicationAlt {
+struct bcm_change_indication {
        u8      u8Type;
        u8      u8Direction;
        u16     u16TID;
@@ -119,7 +118,7 @@ typedef struct stLocalSFChangeIndicationAlt {
        u8      u8CC;    /* < Confirmation Code */
        u8      u8Padd;  /* < 8-bit Padding */
        u16     u16Padd; /* < 16 bit */
-} stLocalSFChangeIndicationAlt;
+};
 
 unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer, unsigned int *puBufferLength);
 int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);