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

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

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



This patch removes typedef for _packet_info,
changes the name of the struct from
_packet_info to bcm_packet_info.
In addition, any calls to the following typedefs
"PacketInfo, _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 774bea83

drivers/staging/bcm/Adapter.h

+2 −4
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ typedef union _U_IP_ADDRESS { 
		UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];

	};

} U_IP_ADDRESS;

struct _packet_info;



typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {

	UCHAR ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
@@ -168,7 +167,7 @@ typedef struct _S_FRAGMENTED_PACKET_INFO { 
	BOOLEAN			bOutOfOrderFragment;

} S_FRAGMENTED_PACKET_INFO, *PS_FRAGMENTED_PACKET_INFO;



struct _packet_info {

struct bcm_packet_info {

	/* classification extension Rule */

	ULONG		ulSFID;

	USHORT		usVCID_Value;
@@ -237,7 +236,6 @@ struct _packet_info { 
	UCHAR		bIPCSSupport;

	UCHAR		bEthCSSupport;

};

typedef struct _packet_info PacketInfo;



struct bcm_tarang_data {

	struct bcm_tarang_data	*next;
@@ -296,7 +294,7 @@ struct _MINI_ADAPTER { 
	USHORT			PrevNumRecvDescs;

	USHORT			CurrNumRecvDescs;

	UINT			u32TotalDSD;

	PacketInfo		PackInfo[NO_OF_QUEUES];

	struct bcm_packet_info	PackInfo[NO_OF_QUEUES];

	S_CLASSIFIER_RULE	astClassifierTable[MAX_CLASSIFIERS];

	BOOLEAN			TransferMode;

drivers/staging/bcm/Bcmchar.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ cntrlEnd: 
		break;



	case IOCTL_GET_PACK_INFO:

		if (copy_to_user(argp, &Adapter->PackInfo, sizeof(PacketInfo)*NO_OF_QUEUES))

		if (copy_to_user(argp, &Adapter->PackInfo, sizeof(struct bcm_packet_info)*NO_OF_QUEUES))

			return -EFAULT;

		Status = STATUS_SUCCESS;

		break;

drivers/staging/bcm/CmHost.c

+1 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap 
int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user *user_buffer)

{

	int status = 0;

	struct _packet_info *psSfInfo = NULL;

	struct bcm_packet_info *psSfInfo = NULL;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d", status);

	status = SearchSfid(Adapter, uiSFId);

drivers/staging/bcm/LeakyBucket.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter) 
* Returns     - The number of bytes allowed for transmission.

*

***********************************************************************/

static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)

static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, struct bcm_packet_info *psSF)

{

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>");

	/* Validate the parameters */
@@ -113,7 +113,7 @@ This function despatches packet from the specified queue. 
@return Zero(success) or Negative value(failure)

*/

static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/

			       PacketInfo *psSF,		/**<Queue identifier*/

			struct bcm_packet_info *psSF, /**<Queue identifier*/

			       struct sk_buff*  Packet)	/**<Pointer to the packet to be sent*/

{

	INT  	Status=STATUS_FAILURE;
@@ -156,7 +156,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ 
* Returns     - None.

*

****************************************************************************/

static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)

static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, struct bcm_packet_info *psSF)

{

	struct sk_buff	*QueuePacket=NULL;

	char 			*pControlPacket = NULL;

drivers/staging/bcm/sort.c

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 


static int compare_packet_info(void const *a, void const *b)

{

	PacketInfo const *pa = a;

	PacketInfo const *pb = b;

	struct bcm_packet_info const *pa = a;

	struct bcm_packet_info const *pb = b;



	if (!pa->bValid || !pb->bValid)

		return 0;
@@ -27,7 +27,7 @@ VOID SortPackInfo(PMINI_ADAPTER Adapter) 
	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,

			DBG_LVL_ALL, "<=======");



	sort(Adapter->PackInfo, NO_OF_QUEUES, sizeof(PacketInfo),

	sort(Adapter->PackInfo, NO_OF_QUEUES, sizeof(struct bcm_packet_info),

		compare_packet_info, NULL);

}