Skip to content

L
linux
Commit b766fb15 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files
Options

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

This patch removes typedef for _stServiceFlowParamSI,
changes the name of the struct to
bcm_connect_mgr_params, and updates the
comments appropriately. In addition, any
calls to typedefs "stServiceFlowParamSI,
*pstServiceFlowParamSI, and CServiceFlowParamSI"
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 fc1ad162
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 64 deletions
drivers/staging/bcm/CmHost.c
View file @ b766fb15
...@@ -428,7 +428,7 @@ VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRu ...@@ -428,7 +428,7 @@ VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRu
* @ingroup ctrl_pkt_functions * @ingroup ctrl_pkt_functions
*/ */
static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
register pstServiceFlowParamSI psfLocalSet, /* <Pointer to the ServiceFlowParamSI structure */ register struct bcm_connect_mgr_params *psfLocalSet, /* Pointer to the connection manager parameters structure */
register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */ register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
register UCHAR ucDsxType, register UCHAR ucDsxType,
stLocalSFAddIndicationAlt *pstAddIndication) { stLocalSFAddIndicationAlt *pstAddIndication) {
...@@ -1300,7 +1300,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) ...@@ -1300,7 +1300,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer) static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)
{ {
UINT nBytesToRead = sizeof(stServiceFlowParamSI); UINT nBytesToRead = sizeof(struct bcm_connect_mgr_params);
if (ulAddrSFParamSet == 0 || NULL == pucDestBuffer) { if (ulAddrSFParamSet == 0 || NULL == pucDestBuffer) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Got Param address as 0!!"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Got Param address as 0!!");
...@@ -1317,7 +1317,7 @@ static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAdd ...@@ -1317,7 +1317,7 @@ static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAdd
static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet) static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet)
{ {
UINT nBytesToWrite = sizeof(stServiceFlowParamSI); UINT nBytesToWrite = sizeof(struct bcm_connect_mgr_params);
int ret = 0; int ret = 0;
if (ulAddrSFParamSet == 0 || NULL == pucSrcBuffer) if (ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
...@@ -1370,7 +1370,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1370,7 +1370,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
return 0; return 0;
/* AUTHORIZED SET */ /* AUTHORIZED SET */
pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *) pstAddIndication->psfAuthorizedSet = (struct bcm_connect_mgr_params *)
GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID); GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
if (!pstAddIndication->psfAuthorizedSet) { if (!pstAddIndication->psfAuthorizedSet) {
kfree(pstAddIndication); kfree(pstAddIndication);
...@@ -1384,7 +1384,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1384,7 +1384,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
} }
/* this can't possibly be right */ /* this can't possibly be right */
pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet); pstAddIndication->psfAuthorizedSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
if (pstAddIndicationAlt->u8Type == DSA_REQ) { if (pstAddIndicationAlt->u8Type == DSA_REQ) {
struct bcm_add_request AddRequest; struct bcm_add_request AddRequest;
...@@ -1412,7 +1412,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1412,7 +1412,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
pstAddIndication->u8CC = pstAddIndicationAlt->u8CC; pstAddIndication->u8CC = pstAddIndicationAlt->u8CC;
/* ADMITTED SET */ /* ADMITTED SET */
pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI *) pstAddIndication->psfAdmittedSet = (struct bcm_connect_mgr_params *)
GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID); GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
if (!pstAddIndication->psfAdmittedSet) { if (!pstAddIndication->psfAdmittedSet) {
kfree(pstAddIndication); kfree(pstAddIndication);
...@@ -1423,10 +1423,10 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1423,10 +1423,10 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
return 0; return 0;
} }
pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAdmittedSet); pstAddIndication->psfAdmittedSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfAdmittedSet);
/* ACTIVE SET */ /* ACTIVE SET */
pstAddIndication->psfActiveSet = (stServiceFlowParamSI *) pstAddIndication->psfActiveSet = (struct bcm_connect_mgr_params *)
GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID); GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
if (!pstAddIndication->psfActiveSet) { if (!pstAddIndication->psfActiveSet) {
kfree(pstAddIndication); kfree(pstAddIndication);
...@@ -1437,7 +1437,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu ...@@ -1437,7 +1437,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
return 0; return 0;
} }
pstAddIndication->psfActiveSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfActiveSet); pstAddIndication->psfActiveSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfActiveSet);
(*puBufferLength) = sizeof(struct bcm_add_indication); (*puBufferLength) = sizeof(struct bcm_add_indication);
*(struct bcm_add_indication *)pvBuffer = *pstAddIndication; *(struct bcm_add_indication *)pvBuffer = *pstAddIndication;
...@@ -1539,7 +1539,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter) ...@@ -1539,7 +1539,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
if (Adapter->astTargetDsxBuffer[0].ulTargetDsxBuffer) if (Adapter->astTargetDsxBuffer[0].ulTargetDsxBuffer)
return 1; return 1;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Size of Each DSX Buffer(Also size of ServiceFlowParamSI): %zx ", sizeof(stServiceFlowParamSI)); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Size of Each DSX Buffer(Also size of connection manager parameters): %zx ", sizeof(struct bcm_connect_mgr_params));
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Reading DSX buffer From Target location %x ", DSX_MESSAGE_EXCHANGE_BUFFER); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Reading DSX buffer From Target location %x ", DSX_MESSAGE_EXCHANGE_BUFFER);
Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER, (PUINT)&ulTargetDsxBuffersBase, sizeof(UINT)); Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER, (PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
...@@ -1550,7 +1550,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter) ...@@ -1550,7 +1550,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Base Address Of DSX Target Buffer : 0x%lx", ulTargetDsxBuffersBase); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Base Address Of DSX Target Buffer : 0x%lx", ulTargetDsxBuffersBase);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Tgt Buffer is Now %lx :", ulTargetDsxBuffersBase); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Tgt Buffer is Now %lx :", ulTargetDsxBuffersBase);
ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE / sizeof(stServiceFlowParamSI); ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE / sizeof(struct bcm_connect_mgr_params);
Adapter->ulTotalTargetBuffersAvailable = Adapter->ulTotalTargetBuffersAvailable =
ulCntTargetBuffers > MAX_TARGET_DSX_BUFFERS ? ulCntTargetBuffers > MAX_TARGET_DSX_BUFFERS ?
...@@ -1562,7 +1562,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter) ...@@ -1562,7 +1562,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer = ulTargetDsxBuffersBase; Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer = ulTargetDsxBuffersBase;
Adapter->astTargetDsxBuffer[i].valid = 1; Adapter->astTargetDsxBuffer[i].valid = 1;
Adapter->astTargetDsxBuffer[i].tid = 0; Adapter->astTargetDsxBuffer[i].tid = 0;
ulTargetDsxBuffersBase += sizeof(stServiceFlowParamSI); ulTargetDsxBuffersBase += sizeof(struct bcm_connect_mgr_params);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " Target DSX Buffer %lx setup at 0x%lx", BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " Target DSX Buffer %lx setup at 0x%lx",
i, Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer); i, Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer);
} }
...@@ -1633,7 +1633,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter) ...@@ -1633,7 +1633,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */) PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
{ {
stServiceFlowParamSI *psfLocalSet = NULL; struct bcm_connect_mgr_params *psfLocalSet = NULL;
stLocalSFAddIndicationAlt *pstAddIndication = NULL; stLocalSFAddIndicationAlt *pstAddIndication = NULL;
stLocalSFChangeIndicationAlt *pstChangeIndication = NULL; stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;
struct bcm_leader *pLeader = NULL; struct bcm_leader *pLeader = NULL;
......
drivers/staging/bcm/CmHost.h
View file @ b766fb15
...@@ -35,8 +35,7 @@ typedef struct stLocalSFAddRequestAlt{ ...@@ -35,8 +35,7 @@ typedef struct stLocalSFAddRequestAlt{
B_UINT16 u16VCID; B_UINT16 u16VCID;
/// \brief structure ParameterSet struct bcm_connect_mgr_params sfParameterSet;
stServiceFlowParamSI sfParameterSet;
//USE_MEMORY_MANAGER(); //USE_MEMORY_MANAGER();
}stLocalSFAddRequestAlt; }stLocalSFAddRequestAlt;
...@@ -50,12 +49,9 @@ typedef struct stLocalSFAddIndicationAlt{ ...@@ -50,12 +49,9 @@ typedef struct stLocalSFAddIndicationAlt{
B_UINT16 u16CID; B_UINT16 u16CID;
/// \brief 16bitVCID /// \brief 16bitVCID
B_UINT16 u16VCID; B_UINT16 u16VCID;
/// \brief structure AuthorizedSet struct bcm_connect_mgr_params sfAuthorizedSet;
stServiceFlowParamSI sfAuthorizedSet; struct bcm_connect_mgr_params sfAdmittedSet;
/// \brief structure AdmittedSet struct bcm_connect_mgr_params sfActiveSet;
stServiceFlowParamSI sfAdmittedSet;
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
B_UINT8 u8CC; /**< Confirmation Code*/ B_UINT8 u8CC; /**< Confirmation Code*/
B_UINT8 u8Padd; /**< 8-bit Padding */ B_UINT8 u8Padd; /**< 8-bit Padding */
...@@ -72,12 +68,9 @@ typedef struct stLocalSFAddConfirmationAlt{ ...@@ -72,12 +68,9 @@ typedef struct stLocalSFAddConfirmationAlt{
B_UINT16 u16CID; B_UINT16 u16CID;
/// \brief 16bitVCID /// \brief 16bitVCID
B_UINT16 u16VCID; B_UINT16 u16VCID;
/// \brief structure AuthorizedSet struct bcm_connect_mgr_params sfAuthorizedSet;
stServiceFlowParamSI sfAuthorizedSet; struct bcm_connect_mgr_params sfAdmittedSet;
/// \brief structure AdmittedSet struct bcm_connect_mgr_params sfActiveSet;
stServiceFlowParamSI sfAdmittedSet;
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
}stLocalSFAddConfirmationAlt; }stLocalSFAddConfirmationAlt;
...@@ -91,16 +84,13 @@ typedef struct stLocalSFChangeRequestAlt{ ...@@ -91,16 +84,13 @@ typedef struct stLocalSFChangeRequestAlt{
/// \brief 16bitVCID /// \brief 16bitVCID
B_UINT16 u16VCID; B_UINT16 u16VCID;
/* /*
//Pointer location at which following Service Flow param Structure can be read //Pointer location at which following connection manager param Structure can be read
//from the target. We get only the address location and we need to read out the //from the target. We only get the address location and we need to read out the
//entire SF param structure at the given location on target //entire connection manager param structure at the given location on target
*/ */
/// \brief structure AuthorizedSet struct bcm_connect_mgr_params sfAuthorizedSet;
stServiceFlowParamSI sfAuthorizedSet; struct bcm_connect_mgr_params sfAdmittedSet;
/// \brief structure AdmittedSet struct bcm_connect_mgr_params sfActiveSet;
stServiceFlowParamSI sfAdmittedSet;
/// \brief structure ParameterSet
stServiceFlowParamSI sfActiveSet;
B_UINT8 u8CC; /**< Confirmation Code*/ B_UINT8 u8CC; /**< Confirmation Code*/
B_UINT8 u8Padd; /**< 8-bit Padding */ B_UINT8 u8Padd; /**< 8-bit Padding */
...@@ -117,12 +107,9 @@ typedef struct stLocalSFChangeConfirmationAlt{ ...@@ -117,12 +107,9 @@ typedef struct stLocalSFChangeConfirmationAlt{
B_UINT16 u16CID; B_UINT16 u16CID;
/// \brief 16bitVCID /// \brief 16bitVCID
B_UINT16 u16VCID; B_UINT16 u16VCID;
/// \brief structure AuthorizedSet struct bcm_connect_mgr_params sfAuthorizedSet;
stServiceFlowParamSI sfAuthorizedSet; struct bcm_connect_mgr_params sfAdmittedSet;
/// \brief structure AdmittedSet struct bcm_connect_mgr_params sfActiveSet;
stServiceFlowParamSI sfAdmittedSet;
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
}stLocalSFChangeConfirmationAlt; }stLocalSFChangeConfirmationAlt;
...@@ -135,12 +122,9 @@ typedef struct stLocalSFChangeIndicationAlt{ ...@@ -135,12 +122,9 @@ typedef struct stLocalSFChangeIndicationAlt{
B_UINT16 u16CID; B_UINT16 u16CID;
/// \brief 16bitVCID /// \brief 16bitVCID
B_UINT16 u16VCID; B_UINT16 u16VCID;
/// \brief structure AuthorizedSet struct bcm_connect_mgr_params sfAuthorizedSet;
stServiceFlowParamSI sfAuthorizedSet; struct bcm_connect_mgr_params sfAdmittedSet;
/// \brief structure AdmittedSet struct bcm_connect_mgr_params sfActiveSet;
stServiceFlowParamSI sfAdmittedSet;
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
B_UINT8 u8CC; /**< Confirmation Code*/ B_UINT8 u8CC; /**< Confirmation Code*/
B_UINT8 u8Padd; /**< 8-bit Padding */ B_UINT8 u8Padd; /**< 8-bit Padding */
......
drivers/staging/bcm/Prototypes.h
View file @ b766fb15
...@@ -95,7 +95,7 @@ void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter); ...@@ -95,7 +95,7 @@ void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter);
int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo); int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo);
void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter,
CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex); struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex);
VOID ResetCounters(struct bcm_mini_adapter *Adapter); VOID ResetCounters(struct bcm_mini_adapter *Adapter);
......
drivers/staging/bcm/cntrl_SignalingInterface.h
View file @ b766fb15
...@@ -137,8 +137,7 @@ struct _stConvergenceSLTypes { ...@@ -137,8 +137,7 @@ struct _stConvergenceSLTypes {
}; };
typedef struct _stConvergenceSLTypes stConvergenceSLTypes, CConvergenceSLTypes, *pstConvergenceSLTypes; typedef struct _stConvergenceSLTypes stConvergenceSLTypes, CConvergenceSLTypes, *pstConvergenceSLTypes;
/* brief structure CServiceFlowParamSI */ struct bcm_connect_mgr_params {
typedef struct _stServiceFlowParamSI {
/* 32bitSFID Of The Service Flow */ /* 32bitSFID Of The Service Flow */
B_UINT32 u32SFID; B_UINT32 u32SFID;
/* 32bit Maximum Sustained Traffic Rate of the Service Flow */ /* 32bit Maximum Sustained Traffic Rate of the Service Flow */
...@@ -256,9 +255,7 @@ typedef struct _stServiceFlowParamSI { ...@@ -256,9 +255,7 @@ typedef struct _stServiceFlowParamSI {
* Structure for Convergence SubLayer Types with a maximum of 4 classifiers * Structure for Convergence SubLayer Types with a maximum of 4 classifiers
*/ */
stConvergenceSLTypes cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF]; stConvergenceSLTypes cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
};
} stServiceFlowParamSI, *pstServiceFlowParamSI;
typedef stServiceFlowParamSI CServiceFlowParamSI;
struct bcm_add_request { struct bcm_add_request {
B_UINT8 u8Type; /* < Type */ B_UINT8 u8Type; /* < Type */
...@@ -269,8 +266,7 @@ struct bcm_add_request { ...@@ -269,8 +266,7 @@ struct bcm_add_request {
B_UINT16 u16CID; /* < 16bit CID */ B_UINT16 u16CID; /* < 16bit CID */
/* brief 16bitVCID */ /* brief 16bitVCID */
B_UINT16 u16VCID; /* < 16bit VCID */ B_UINT16 u16VCID; /* < 16bit VCID */
/* brief structure ParameterSet */ struct bcm_connect_mgr_params *psfParameterSet; /* < connection manager parameters */
stServiceFlowParamSI *psfParameterSet; /* < structure ParameterSet */
}; };
struct bcm_add_indication { struct bcm_add_indication {
...@@ -282,13 +278,9 @@ struct bcm_add_indication { ...@@ -282,13 +278,9 @@ struct bcm_add_indication {
B_UINT16 u16CID; /* < 16bitCID */ B_UINT16 u16CID; /* < 16bitCID */
/* brief 16bitVCID */ /* brief 16bitVCID */
B_UINT16 u16VCID; /* < 16bitVCID */ B_UINT16 u16VCID; /* < 16bitVCID */
/* brief structure AuthorizedSet */ struct bcm_connect_mgr_params *psfAuthorizedSet; /* Authorized set of connection manager parameters */
/* brief structure AuthorizedSet */ struct bcm_connect_mgr_params *psfAdmittedSet; /* Admitted set of connection manager parameters */
stServiceFlowParamSI *psfAuthorizedSet; /* < AuthorizedSet of type stServiceFlowParamSI */ struct bcm_connect_mgr_params *psfActiveSet; /* Activeset of connection manager parameters */
/* brief structure AdmittedSet */
stServiceFlowParamSI *psfAdmittedSet; /* < AdmittedSet of type stServiceFlowParamSI */
/* brief structure ActiveSet */
stServiceFlowParamSI *psfActiveSet; /* < sfActiveSet of type stServiceFlowParamSI */
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 */
......
drivers/staging/bcm/hostmibs.c
View file @ b766fb15
...@@ -101,7 +101,7 @@ VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_t ...@@ -101,7 +101,7 @@ VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_t
sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES)); sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
} }
VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex) VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
{ {
S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable; S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7