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

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

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



This patch removes typedef for _LEADER, changes the
name of the struct from _LEADER to bcm_leader.
In addition, any calls to the following typedefs
"LEADER, *PLEADER" 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 a869993f

drivers/staging/bcm/Adapter.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -7,16 +7,15 @@ 
#define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256

#define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256

#include "Debug.h"

#include "Debug.h"





struct _LEADER {

struct bcm_leader {

	USHORT	Vcid;

	USHORT	Vcid;

	USHORT	PLength;

	USHORT	PLength;

	UCHAR	Status;

	UCHAR	Status;

	UCHAR	Unused[3];

	UCHAR	Unused[3];

} __packed;

} __packed;

typedef struct _LEADER LEADER, *PLEADER;





struct bcm_packettosend {

struct bcm_packettosend {

	LEADER	Leader;

	struct bcm_leader Leader;

	UCHAR	ucPayload;

	UCHAR	ucPayload;

} __packed;

} __packed;
@@ -27,7 +26,7 @@ struct bcm_control_packet { 
} __packed;

} __packed;





struct bcm_link_request {

struct bcm_link_request {

	LEADER	Leader;

	struct bcm_leader Leader;

	UCHAR	szData[4];

	UCHAR	szData[4];

} __packed;

} __packed;

drivers/staging/bcm/CmHost.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1663,7 +1663,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap 
	stServiceFlowParamSI *psfLocalSet = NULL;

	stServiceFlowParamSI *psfLocalSet = NULL;

	stLocalSFAddIndicationAlt *pstAddIndication = NULL;

	stLocalSFAddIndicationAlt *pstAddIndication = NULL;

	stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;

	stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;

	PLEADER pLeader = NULL;

	struct bcm_leader *pLeader = NULL;





	/*

	/*

	 * Otherwise the message contains a target address from where we need to

	 * Otherwise the message contains a target address from where we need to
@@ -1678,7 +1678,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap 




	DumpCmControlPacket(pstAddIndication);

	DumpCmControlPacket(pstAddIndication);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "====>");

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "====>");

	pLeader = (PLEADER)Adapter->caDsxReqResp;

	pLeader = (struct bcm_leader *)Adapter->caDsxReqResp;





	pLeader->Status = CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;

	pLeader->Status = CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;

	pLeader->Vcid = 0;

	pLeader->Vcid = 0;

drivers/staging/bcm/InterfaceRx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ static void read_bulk_callback(struct urb *urb) 
	PUSB_RCB pRcb = (PUSB_RCB)urb->context;

	PUSB_RCB pRcb = (PUSB_RCB)urb->context;

	PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;

	PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;

	PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;

	PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;

	PLEADER pLeader = urb->transfer_buffer;

	struct bcm_leader *pLeader = urb->transfer_buffer;





	if (unlikely(netif_msg_rx_status(Adapter)))

	if (unlikely(netif_msg_rx_status(Adapter)))

		pr_info(PFX "%s: rx urb status %d length %d\n",

		pr_info(PFX "%s: rx urb status %d length %d\n",
@@ -126,7 +126,7 @@ static void read_bulk_callback(struct urb *urb) 
	    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");

	    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");

		*(PUSHORT)skb->data = pLeader->Status;

		*(PUSHORT)skb->data = pLeader->Status;

       	memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +

       	memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +

			(sizeof(LEADER)), pLeader->PLength);

			(sizeof(struct bcm_leader)), pLeader->PLength);

		skb->len = pLeader->PLength + sizeof(USHORT);

		skb->len = pLeader->PLength + sizeof(USHORT);





		spin_lock(&Adapter->control_queue_lock);

		spin_lock(&Adapter->control_queue_lock);
@@ -144,7 +144,7 @@ static void read_bulk_callback(struct urb *urb) 
		  */

		  */

        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");

        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");

		skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);

		skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);

		memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength);

		memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(struct bcm_leader), pLeader->PLength);

		skb->dev = Adapter->dev;

		skb->dev = Adapter->dev;





		/* currently skb->len has extra ETH_HLEN bytes in the beginning */

		/* currently skb->len has extra ETH_HLEN bytes in the beginning */

drivers/staging/bcm/LeakyBucket.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -243,10 +243,10 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, struct bcm_packet 
				{

				{

					spin_lock_bh(&psSF->SFQueueLock);

					spin_lock_bh(&psSF->SFQueueLock);

					psSF->NumOfPacketsSent++;

					psSF->NumOfPacketsSent++;

					psSF->uiSentBytes+=((PLEADER)pControlPacket)->PLength;

					psSF->uiSentBytes+=((struct bcm_leader *)pControlPacket)->PLength;

					psSF->uiSentPackets++;

					psSF->uiSentPackets++;

					atomic_dec(&Adapter->TotalPacketCount);

					atomic_dec(&Adapter->TotalPacketCount);

					psSF->uiCurrentBytesOnHost -= ((PLEADER)pControlPacket)->PLength;

					psSF->uiCurrentBytesOnHost -= ((struct bcm_leader *)pControlPacket)->PLength;

					psSF->uiCurrentPacketsOnHost--;

					psSF->uiCurrentPacketsOnHost--;

					atomic_inc(&Adapter->index_rd_txcntrlpkt);

					atomic_inc(&Adapter->index_rd_txcntrlpkt);

					spin_unlock_bh(&psSF->SFQueueLock);

					spin_unlock_bh(&psSF->SFQueueLock);

drivers/staging/bcm/Macros.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ 
/*Leader related terms */

/*Leader related terms */

#define LEADER_STATUS         0x00

#define LEADER_STATUS         0x00

#define LEADER_STATUS_TCP_ACK 0x1

#define LEADER_STATUS_TCP_ACK 0x1

#define LEADER_SIZE           sizeof(LEADER)

#define LEADER_SIZE           sizeof(struct bcm_leader)

#define MAC_ADDR_REQ_SIZE     sizeof(struct bcm_packettosend)

#define MAC_ADDR_REQ_SIZE     sizeof(struct bcm_packettosend)

#define SS_INFO_REQ_SIZE      sizeof(struct bcm_packettosend)

#define SS_INFO_REQ_SIZE      sizeof(struct bcm_packettosend)

#define CM_REQUEST_SIZE       (LEADER_SIZE + sizeof(stLocalSFChangeRequest))

#define CM_REQUEST_SIZE       (LEADER_SIZE + sizeof(stLocalSFChangeRequest))