Commit 954f91d1 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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



This patch removes typedef for _S_MIBS_HOST_STATS_MIBS,
and changes the name of the struct to bcm_host_stats_mibs.
In addition, any calls to typedefs S_MIBS_HOST_STATS_MIBS
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 2a4d3a20

drivers/staging/bcm/Bcmchar.c

+4 −4
Original line number Diff line number Diff line
@@ -1083,15 +1083,15 @@ cntrlEnd: 
		if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

			return -EFAULT;



		if (IoBuffer.OutputLength != sizeof(S_MIBS_HOST_STATS_MIBS)) {

		if (IoBuffer.OutputLength != sizeof(struct bcm_host_stats_mibs)) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"Length Check failed %lu %zd\n",

					IoBuffer.OutputLength, sizeof(S_MIBS_HOST_STATS_MIBS));

					IoBuffer.OutputLength, sizeof(struct bcm_host_stats_mibs));

			return -EINVAL;

		}



		/* FIXME: HOST_STATS are too big for kmalloc (122048)! */

		temp_buff = kzalloc(sizeof(S_MIBS_HOST_STATS_MIBS), GFP_KERNEL);

		temp_buff = kzalloc(sizeof(struct bcm_host_stats_mibs), GFP_KERNEL);

		if (!temp_buff)

			return STATUS_FAILURE;
@@ -1099,7 +1099,7 @@ cntrlEnd: 
		GetDroppedAppCntrlPktMibs(temp_buff, pTarang);



		if (Status != STATUS_FAILURE)

			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS))) {

			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(struct bcm_host_stats_mibs))) {

				kfree(temp_buff);

				return -EFAULT;

			}

drivers/staging/bcm/HostMIBSInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -181,12 +181,12 @@ typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES { 
	unsigned long low_priority_message;

} S_MIBS_DROPPED_APP_CNTRL_MESSAGES;



typedef struct _S_MIBS_HOST_STATS_MIBS {

struct bcm_host_stats_mibs {

	S_MIBS_HOST_INFO	stHostInfo;

	S_MIBS_CLASSIFIER_RULE	astClassifierTable[MIBS_MAX_CLASSIFIERS];

	S_MIBS_SERVICEFLOW_TABLE astSFtable[MIBS_MAX_SERVICEFLOWS];

	S_MIBS_PHS_RULE		astPhsRulesTable[MIBS_MAX_PHSRULES];

	S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs;

} S_MIBS_HOST_STATS_MIBS;

};



#endif

drivers/staging/bcm/Prototypes.h

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId 
void SendIdleModeResponse(struct bcm_mini_adapter *Adapter);





int  ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *buf);

void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, struct bcm_tarang_data *pTarang);

int  ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *buf);

void GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *ioBuffer, struct bcm_tarang_data *pTarang);

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);

drivers/staging/bcm/hostmibs.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include "headers.h"



INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)

INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *pstHostMibs)

{

	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;

	S_PHS_RULE *pstPhsRule = NULL;
@@ -94,7 +94,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS 
	return STATUS_SUCCESS;

}



VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_tarang_data *pTarang)

VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct bcm_tarang_data *pTarang)

{

	memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),

	       &(pTarang->stDroppedAppCntrlMsgs),

CRA Git | Maintained and supported by SUSTech CRA and CCSE