Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f22485d authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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



This patch removes typedef for _S_FRAGMENTED_PACKET_INFO,
changes the name of the struct from
_S_FRAGMENTED_PACKET_INFO to bcm_fragmented_packet_info.
In addition, any calls to the following typedefs
"S_FRAGMENTED_PACKET_INFO, *PS_FRAGMENTED_PACKET_INFO"
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 0b3edf76

drivers/staging/bcm/Adapter.h

+3 −3
Original line number Diff line number Diff line
@@ -159,13 +159,13 @@ typedef struct _S_CLASSIFIER_RULE { 
} S_CLASSIFIER_RULE;

/* typedef struct _S_CLASSIFIER_RULE S_CLASSIFIER_RULE; */



typedef struct _S_FRAGMENTED_PACKET_INFO {

struct bcm_fragmented_packet_info {

	BOOLEAN			bUsed;

	ULONG			ulSrcIpAddress;

	USHORT			usIpIdentification;

	S_CLASSIFIER_RULE	*pstMatchedClassifierEntry;

	BOOLEAN			bOutOfOrderFragment;

} S_FRAGMENTED_PACKET_INFO, *PS_FRAGMENTED_PACKET_INFO;

};



struct bcm_packet_info {

	/* classification extension Rule */
@@ -389,7 +389,7 @@ struct _MINI_ADAPTER { 
	BOOLEAN			bDPLLConfig;

	UINT32			aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];

	UINT32			aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];

	S_FRAGMENTED_PACKET_INFO astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];

	struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];

	atomic_t		uiMBupdate;

	UINT32			PmuMode;

	NVM_TYPE		eNVMType;

drivers/staging/bcm/Misc.c

+4 −4
Original line number Diff line number Diff line
@@ -1533,12 +1533,12 @@ S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentific 
	return NULL;

}



void AddFragIPClsEntry(PMINI_ADAPTER Adapter, PS_FRAGMENTED_PACKET_INFO psFragPktInfo)

void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo)

{

	UINT uiIndex = 0;

	for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {

		if (!Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) {

			memcpy(&Adapter->astFragmentedPktClassifierTable[uiIndex], psFragPktInfo, sizeof(S_FRAGMENTED_PACKET_INFO));

			memcpy(&Adapter->astFragmentedPktClassifierTable[uiIndex], psFragPktInfo, sizeof(struct bcm_fragmented_packet_info));

			break;

		}

	}
@@ -1552,7 +1552,7 @@ void DelFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG S 
			(Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&

			(Adapter->astFragmentedPktClassifierTable[uiIndex].ulSrcIpAddress == SrcIp))



			memset(&Adapter->astFragmentedPktClassifierTable[uiIndex], 0, sizeof(S_FRAGMENTED_PACKET_INFO));

			memset(&Adapter->astFragmentedPktClassifierTable[uiIndex], 0, sizeof(struct bcm_fragmented_packet_info));

	}

}
@@ -1652,7 +1652,7 @@ static void beceem_protocol_reset(PMINI_ADAPTER Adapter) 
	if (Adapter->TimerActive == TRUE)

		Adapter->TimerActive = FALSE;



	memset(Adapter->astFragmentedPktClassifierTable, 0, sizeof(S_FRAGMENTED_PACKET_INFO) * MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES);

	memset(Adapter->astFragmentedPktClassifierTable, 0, sizeof(struct bcm_fragmented_packet_info) * MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES);



	for (i = 0; i < HiPriority; i++) {

		/* resetting only the first size (S_MIBS_SERVICEFLOW_TABLE) for the SF. */

drivers/staging/bcm/Prototypes.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter); 


S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIP);



void AddFragIPClsEntry(PMINI_ADAPTER Adapter,PS_FRAGMENTED_PACKET_INFO psFragPktInfo);

void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo);



void DelFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIp);

drivers/staging/bcm/Qos.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb) 
		if(bFragmentedPkt && (usCurrFragment == 0))

		{

			//First Fragment of Fragmented Packet. Create Frag CLS Entry

			S_FRAGMENTED_PACKET_INFO stFragPktInfo;

			struct bcm_fragmented_packet_info stFragPktInfo;

			stFragPktInfo.bUsed = TRUE;

			stFragPktInfo.ulSrcIpAddress = pIpHeader->saddr;

			stFragPktInfo.usIpIdentification = pIpHeader->id;