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

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

This patch removes typedef for _stLocalSFAddIndication,
and changes the name of the struct to
bcm_add_indication. In addition, any
calls to typedefs "stLocalSFAddIndication,
*pstLocalSFAddIndication, stLocalSFChangeRequest,
*pstLocalSFChangeRequest, stLocalSFChangeIndication,
or *pstLocalSFChangeIndication " are changed to
call the struct directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec5bb992
...@@ -1334,7 +1334,7 @@ static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ...@@ -1334,7 +1334,7 @@ static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer,
ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength) ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength)
{ {
stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
stLocalSFAddIndication *pstAddIndication = NULL; struct bcm_add_indication *pstAddIndication = NULL;
struct bcm_del_request *pstDeletionRequest; struct bcm_del_request *pstDeletionRequest;
UINT uiSearchRuleIndex; UINT uiSearchRuleIndex;
ULONG ulSFID; ULONG ulSFID;
...@@ -1365,7 +1365,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1365,7 +1365,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
} }
/* For DSA_REQ, only up to "psfAuthorizedSet" parameter should be accessed by driver! */ /* For DSA_REQ, only up to "psfAuthorizedSet" parameter should be accessed by driver! */
pstAddIndication = kmalloc(sizeof(*pstAddIndication), GFP_KERNEL); pstAddIndication = kmalloc(sizeof(struct bcm_add_indication), GFP_KERNEL);
if (pstAddIndication == NULL) if (pstAddIndication == NULL)
return 0; return 0;
...@@ -1439,8 +1439,8 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1439,8 +1439,8 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
pstAddIndication->psfActiveSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfActiveSet); pstAddIndication->psfActiveSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfActiveSet);
(*puBufferLength) = sizeof(stLocalSFAddIndication); (*puBufferLength) = sizeof(struct bcm_add_indication);
*(stLocalSFAddIndication *)pvBuffer = *pstAddIndication; *(struct bcm_add_indication *)pvBuffer = *pstAddIndication;
kfree(pstAddIndication); kfree(pstAddIndication);
return 1; return 1;
} }
...@@ -1449,10 +1449,10 @@ static inline stLocalSFAddIndicationAlt ...@@ -1449,10 +1449,10 @@ static inline stLocalSFAddIndicationAlt
*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer) *RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer)
{ {
ULONG ulStatus = 0; ULONG ulStatus = 0;
stLocalSFAddIndication *pstAddIndication = NULL; struct bcm_add_indication *pstAddIndication = NULL;
stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL; stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL;
pstAddIndication = (stLocalSFAddIndication *)(pvBuffer); pstAddIndication = (struct bcm_add_indication *)(pvBuffer);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>");
if ((pstAddIndication->u8Type == DSD_REQ) || if ((pstAddIndication->u8Type == DSD_REQ) ||
(pstAddIndication->u8Type == DSD_RSP) || (pstAddIndication->u8Type == DSD_RSP) ||
...@@ -1644,7 +1644,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer ...@@ -1644,7 +1644,7 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer
*/ */
pstAddIndication = RestoreCmControlResponseMessage(Adapter, pvBuffer); pstAddIndication = RestoreCmControlResponseMessage(Adapter, pvBuffer);
if (pstAddIndication == NULL) { if (pstAddIndication == NULL) {
ClearTargetDSXBuffer(Adapter, ((stLocalSFAddIndication *)pvBuffer)->u16TID, FALSE); ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication *)pvBuffer)->u16TID, FALSE);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Error in restoring Service Flow param structure from DSx message"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Error in restoring Service Flow param structure from DSx message");
return FALSE; return FALSE;
} }
......
...@@ -277,10 +277,7 @@ typedef struct _stLocalSFAddRequest { ...@@ -277,10 +277,7 @@ typedef struct _stLocalSFAddRequest {
} stLocalSFAddRequest, *pstLocalSFAddRequest; } stLocalSFAddRequest, *pstLocalSFAddRequest;
/* struct bcm_add_indication {
* structure stLocalSFAddIndication
*/
typedef struct _stLocalSFAddIndication {
B_UINT8 u8Type; /* < Type */ B_UINT8 u8Type; /* < Type */
B_UINT8 eConnectionDir; /* < Connection Direction */ B_UINT8 eConnectionDir; /* < Connection Direction */
/* brief 16 bit TID */ /* brief 16 bit TID */
...@@ -299,18 +296,7 @@ typedef struct _stLocalSFAddIndication { ...@@ -299,18 +296,7 @@ typedef struct _stLocalSFAddIndication {
B_UINT8 u8CC; /* <Confirmation Code */ B_UINT8 u8CC; /* <Confirmation Code */
B_UINT8 u8Padd; /* < 8-bit Padding */ B_UINT8 u8Padd; /* < 8-bit Padding */
B_UINT16 u16Padd; /* < 16 bit Padding */ B_UINT16 u16Padd; /* < 16 bit Padding */
};
} stLocalSFAddIndication;
typedef struct _stLocalSFAddIndication *pstLocalSFAddIndication;
/*
* structure stLocalSFChangeRequest is same as structure stLocalSFAddIndication
*/
typedef struct _stLocalSFAddIndication stLocalSFChangeRequest, *pstLocalSFChangeRequest;
/*
* structure stLocalSFChangeIndication is same as structure stLocalSFAddIndication
*/
typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFChangeIndication;
struct bcm_del_request { struct bcm_del_request {
B_UINT8 u8Type; /* < Type */ B_UINT8 u8Type; /* < Type */
......
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