Commit 497f1d5c authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7945344
...@@ -1635,7 +1635,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer ...@@ -1635,7 +1635,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer
{ {
struct bcm_connect_mgr_params *psfLocalSet = NULL; struct bcm_connect_mgr_params *psfLocalSet = NULL;
stLocalSFAddIndicationAlt *pstAddIndication = NULL; stLocalSFAddIndicationAlt *pstAddIndication = NULL;
stLocalSFChangeIndicationAlt *pstChangeIndication = NULL; struct bcm_change_indication *pstChangeIndication = NULL;
struct bcm_leader *pLeader = NULL; struct bcm_leader *pLeader = NULL;
/* /*
...@@ -1773,12 +1773,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer ...@@ -1773,12 +1773,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer
break; break;
case DSC_REQ: case DSC_REQ:
{ {
pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt); pLeader->PLength = sizeof(struct bcm_change_indication);
pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication; 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); 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; *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP; ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
kfree(pstAddIndication); kfree(pstAddIndication);
...@@ -1786,17 +1786,17 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer ...@@ -1786,17 +1786,17 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer
break; break;
case DSC_RSP: case DSC_RSP:
{ {
pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt); pLeader->PLength = sizeof(struct bcm_change_indication);
pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication; 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); 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; *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK; ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
} }
case DSC_ACK: case DSC_ACK:
{ {
UINT uiSearchRuleIndex = 0; UINT uiSearchRuleIndex = 0;
pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication; pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
uiSearchRuleIndex = SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID)); uiSearchRuleIndex = SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID));
if (uiSearchRuleIndex > NO_OF_QUEUES-1) 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"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "SF doesn't exist for which DSC_ACK is received");
......
...@@ -104,8 +104,7 @@ typedef struct stLocalSFChangeConfirmationAlt { ...@@ -104,8 +104,7 @@ typedef struct stLocalSFChangeConfirmationAlt {
struct bcm_connect_mgr_params sfActiveSet; struct bcm_connect_mgr_params sfActiveSet;
} stLocalSFChangeConfirmationAlt; } stLocalSFChangeConfirmationAlt;
/* brief structure stLocalSFChangeIndication */ struct bcm_change_indication {
typedef struct stLocalSFChangeIndicationAlt {
u8 u8Type; u8 u8Type;
u8 u8Direction; u8 u8Direction;
u16 u16TID; u16 u16TID;
...@@ -119,7 +118,7 @@ typedef struct stLocalSFChangeIndicationAlt { ...@@ -119,7 +118,7 @@ typedef struct stLocalSFChangeIndicationAlt {
u8 u8CC; /* < Confirmation Code */ u8 u8CC; /* < Confirmation Code */
u8 u8Padd; /* < 8-bit Padding */ u8 u8Padd; /* < 8-bit Padding */
u16 u16Padd; /* < 16 bit */ u16 u16Padd; /* < 16 bit */
} stLocalSFChangeIndicationAlt; };
unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer, unsigned int *puBufferLength); unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer, unsigned int *puBufferLength);
int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter); int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment