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

Commit ceeb6fec authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: Fix recieve/receive typos 



Just spelling fixes.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d9b42c01

drivers/staging/bcm/Debug.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */ 


// TODO - put PHS_SEND in Tx PHS_RECEIVE in Rx path ?

#define PHS_SEND    	(OTHERS<<16)

#define PHS_RECIEVE 	(OTHERS<<17)

#define PHS_RECEIVE 	(OTHERS<<17)

#define PHS_MODULE 	    (OTHERS<<18)



#define INTF_INIT    	(OTHERS<<19)

drivers/staging/bcm/InterfaceRx.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void read_bulk_callback(struct urb *urb) 
		{

			/* Moving ahead by ETH_HLEN to the data ptr as received from FW */

			skb_pull(skb, ETH_HLEN);

			PHSRecieve(Adapter, pLeader->Vcid, skb, &skb->len,

			PHSReceive(Adapter, pLeader->Vcid, skb, &skb->len,

					NULL,bHeaderSupressionEnabled);



			if(!Adapter->PackInfo[QueueIndex].bEthCSSupport)
@@ -229,7 +229,7 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb) 
/*

Function:				InterfaceRx



Description:			This is the hardware specific Function for Recieveing

Description:			This is the hardware specific Function for Receiving

						data packet/control packets from the device.



Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context

drivers/staging/bcm/Macros.h

+2 −2
Original line number Diff line number Diff line
@@ -176,8 +176,8 @@ enum enLinkStatus { 
    PHY_SYNC_ACHIVED = 	2,

    LINKUP_IN_PROGRESS = 3,

    LINKUP_DONE     = 	4,

    DREG_RECIEVED =		5,

    LINK_STATUS_RESET_RECIEVED = 6,

    DREG_RECEIVED =		5,

    LINK_STATUS_RESET_RECEIVED = 6,

    PERIODIC_WAKE_UP_NOTIFICATION_FRM_FW  = 7,

    LINK_SHUTDOWN_REQ_FROM_FIRMWARE = 8,

    COMPLETE_WAKE_UP_NOTIFICATION_FRM_FW =9

drivers/staging/bcm/PHSModule.c

+12 −12
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter, 
	return STATUS_SUCCESS;

}



int PHSRecieve(PMINI_ADAPTER Adapter,

int PHSReceive(PMINI_ADAPTER Adapter,

					USHORT usVcid,

					struct sk_buff *packet,

					UINT *punPacketLen,
@@ -223,7 +223,7 @@ int PHSRecieve(PMINI_ADAPTER Adapter, 
	UINT TotalBytesAdded = 0;

	if(!bHeaderSuppressionEnabled)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nPhs Disabled for incoming packet");

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nPhs Disabled for incoming packet");

		return ulPhsStatus;

	}
@@ -238,7 +238,7 @@ int PHSRecieve(PMINI_ADAPTER Adapter, 
		&nTotalsupressedPktHdrBytes,

		&nStandardPktHdrLen);



	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nSupressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x",

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nSupressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x",

					nTotalsupressedPktHdrBytes,nStandardPktHdrLen);



	if(ulPhsStatus != STATUS_PHS_COMPRESSED)
@@ -786,14 +786,14 @@ ULONG PhsDeCompress(IN void* pvContext, 


	if(pDeviceExtension == NULL)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"Invalid Device Extension\n");

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"Invalid Device Extension\n");

		return ERR_PHS_INVALID_DEVICE_EXETENSION;

	}



	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"Restoring header \n");

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"Restoring header\n");



	phsi = *((unsigned char *)(pvInputBuffer));

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"PHSI To Be Used For restore : %x \n",phsi);

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"PHSI To Be Used For restore : %x\n",phsi);

    if(phsi == UNCOMPRESSED_PACKET )

	{

		return STATUS_PHS_NOCOMPRESSION;
@@ -804,7 +804,7 @@ ULONG PhsDeCompress(IN void* pvContext, 
	      uiVcid,&pstServiceFlowEntry);

	if(nSFIndex == PHS_INVALID_TABLE_INDEX)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"SFID Match Failed During Lookup\n");

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"SFID Match Failed During Lookup\n");

		return ERR_SF_MATCH_FAIL;

	}
@@ -1417,7 +1417,7 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf, 
	int in_buf_len = *header_size-1;

    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);

	in_buf++;

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"====>\n");

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"====>\n");

	*header_size = 0;



	if((decomp_phs_rules == NULL ))
@@ -1425,7 +1425,7 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf, 




	tmp_memb = decomp_phs_rules;

	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI 1  %d",phsi));

	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI 1  %d",phsi));

	//*header_size = tmp_memb->u8PHSFLength;

	phss         = tmp_memb->u8PHSS;

	phsf         = tmp_memb->u8PHSF;
@@ -1433,7 +1433,7 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf, 


	if(phss > MAX_PHS_LENGTHS)

		phss = MAX_PHS_LENGTHS;

	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI  %d phss %d index %d",phsi,phss,index));

	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI  %d phss %d index %d",phsi,phss,index));

	while((phss > 0) && (size < in_buf_len))

	{

		bit =  ((*phsm << i)& SUPPRESS);
@@ -1441,13 +1441,13 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf, 
		if(bit == SUPPRESS)

		{

			*out_buf = *phsf;

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d phsf %d ouput %d",

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d phsf %d ouput %d",

              phss,*phsf,*out_buf);

		}

		else

		{

			*out_buf = *in_buf;

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECIEVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d input %d ouput %d",

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d input %d ouput %d",

            phss,*in_buf,*out_buf);

			in_buf++;

			size++;

drivers/staging/bcm/PHSModule.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter, 
					 PUINT PacketLen,

					 UCHAR bEthCSSupport);



int PHSRecieve(PMINI_ADAPTER Adapter,

int PHSReceive(PMINI_ADAPTER Adapter,

					USHORT usVcid,

					struct sk_buff *packet,

					UINT *punPacketLen,