From: Kevin McKinney <klmckinney1@gmail.com>
To: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org
Cc: dan.carpenter@oracle.com, Kevin McKinney <klmckinney1@gmail.com>
Subject: [PATCH 03/11 V2] Staging: bcm: Replace USHORT with unsigned short in Adapter.h
Date: Mon, 28 Oct 2013 23:51:40 -0400 [thread overview]
Message-ID: <1383018708-29615-4-git-send-email-klmckinney1@gmail.com> (raw)
In-Reply-To: <1383018708-29615-1-git-send-email-klmckinney1@gmail.com>
This patch replaces "USHORT" with "unsigned
short" in Adapter.h
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
drivers/staging/bcm/Adapter.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 33b5063..08bd9fc 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -8,8 +8,8 @@
#include "Debug.h"
struct bcm_leader {
- USHORT Vcid;
- USHORT PLength;
+ unsigned short Vcid;
+ unsigned short PLength;
UCHAR Status;
UCHAR Unused[3];
} __packed;
@@ -64,7 +64,7 @@ struct bcm_classifier_rule {
UCHAR ucReserved[2];
B_UINT16 uiClassifierRuleIndex;
bool bUsed;
- USHORT usVCID_Value;
+ unsigned short usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
union bcm_ip_address stSrcIpAddress;
UCHAR ucIPSourceAddressLength; /* Ip Source Address Length */
@@ -78,12 +78,12 @@ struct bcm_classifier_rule {
UCHAR ucProtocolLength; /* protocol Length */
UCHAR ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
- USHORT usSrcPortRangeLo[MAX_PORT_RANGE];
- USHORT usSrcPortRangeHi[MAX_PORT_RANGE];
+ unsigned short usSrcPortRangeLo[MAX_PORT_RANGE];
+ unsigned short usSrcPortRangeHi[MAX_PORT_RANGE];
UCHAR ucSrcPortRangeLength;
- USHORT usDestPortRangeLo[MAX_PORT_RANGE];
- USHORT usDestPortRangeHi[MAX_PORT_RANGE];
+ unsigned short usDestPortRangeLo[MAX_PORT_RANGE];
+ unsigned short usDestPortRangeHi[MAX_PORT_RANGE];
UCHAR ucDestPortRangeLength;
bool bProtocolValid;
@@ -108,14 +108,14 @@ struct bcm_classifier_rule {
UCHAR ucEtherTypeLen;
UCHAR au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
UCHAR usUserPriority[2];
- USHORT usVLANID;
- USHORT usValidityBitMap;
+ unsigned short usVLANID;
+ unsigned short usValidityBitMap;
};
struct bcm_fragmented_packet_info {
bool bUsed;
ULONG ulSrcIpAddress;
- USHORT usIpIdentification;
+ unsigned short usIpIdentification;
struct bcm_classifier_rule *pstMatchedClassifierEntry;
bool bOutOfOrderFragment;
};
@@ -123,7 +123,7 @@ struct bcm_fragmented_packet_info {
struct bcm_packet_info {
/* classification extension Rule */
ULONG ulSFID;
- USHORT usVCID_Value;
+ unsigned short usVCID_Value;
UINT uiThreshold;
/* This field determines the priority of the SF Queues */
B_UINT8 u8TrafficPriority;
@@ -150,7 +150,7 @@ struct bcm_packet_info {
UINT uiMaxAllowedRate;
UINT NumOfPacketsSent;
UCHAR ucDirection;
- USHORT usCID;
+ unsigned short usCID;
struct bcm_mibs_parameters stMibsExtServiceFlowTable;
UINT uiCurrentRxRate;
UINT uiThisPeriodRxBytes;
@@ -244,8 +244,8 @@ struct bcm_mini_adapter {
/* this to keep track of the Tx and Rx MailBox Registers. */
atomic_t CurrNumFreeTxDesc;
/* to keep track the no of byte received */
- USHORT PrevNumRecvDescs;
- USHORT CurrNumRecvDescs;
+ unsigned short PrevNumRecvDescs;
+ unsigned short CurrNumRecvDescs;
UINT u32TotalDSD;
struct bcm_packet_info PackInfo[NO_OF_QUEUES];
struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
@@ -284,7 +284,7 @@ struct bcm_mini_adapter {
bool bBinDownloaded;
bool bCfgDownloaded;
bool bSyncUpRequestSent;
- USHORT usBestEffortQueueIndex;
+ unsigned short usBestEffortQueueIndex;
wait_queue_head_t ioctl_fw_dnld_wait_queue;
bool waiting_to_fw_download_done;
pid_t fw_download_process_pid;
@@ -400,7 +400,7 @@ struct bcm_mini_adapter {
struct bcm_eth_header {
UCHAR au8DestinationAddress[6];
UCHAR au8SourceAddress[6];
- USHORT u16Etype;
+ unsigned short u16Etype;
} __packed;
struct bcm_firmware_info {
--
1.7.9.5
next prev parent reply other threads:[~2013-10-29 3:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 3:51 [PATCH 00/11 V2] Staging: bcm: Cleanup Adapter.h Kevin McKinney
2013-10-29 3:51 ` [PATCH 01/11 V2] Staging: bcm: Fix WARNING: space prohibited before semicolon Kevin McKinney
2013-10-29 3:51 ` [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly Kevin McKinney
2013-10-29 16:01 ` Greg KH
2013-10-29 16:03 ` Greg KH
[not found] ` <CAKPrQY9OTnJMEZ9=PhwXDbSxaKwt0t1A1HEFmCde-x-WDXDPoA@mail.gmail.com>
2013-10-29 17:04 ` Greg KH
[not found] ` <CAKPrQY-EVT4YfYDo6tWuuER8+e1x_0nvyRoBZW2qRyF47zutcw@mail.gmail.com>
2013-10-29 17:52 ` Greg KH
2013-10-29 3:51 ` Kevin McKinney [this message]
2013-10-29 3:51 ` [PATCH 04/11 V2] Staging: bcm: Replaces UCHAR with u8 in Adapter.h Kevin McKinney
2013-10-29 3:51 ` [PATCH 05/11 V2] Staging: bcm: Replace ULONG with unsigned long or u32 " Kevin McKinney
2013-10-29 3:51 ` [PATCH 06/11 V2] Staging: bcm: Replace B_UINT16 with u16 " Kevin McKinney
2013-10-29 3:51 ` [PATCH 07/11 V2] Staging: bcm: Replace B_UINT8 with u8 " Kevin McKinney
2013-10-29 3:51 ` [PATCH 08/11 V2] Staging: bcm: Replace UINT32 with u32 " Kevin McKinney
2013-10-29 3:51 ` [PATCH 09/11 V2] Staging: bcm: Replace UINT with unsigned int " Kevin McKinney
2013-10-29 3:51 ` [PATCH 10/11 V2] Staging: bcm: Replace PVOID with void * " Kevin McKinney
2013-10-29 3:51 ` [PATCH 11/11 V2] Staging: bcm: Replace LARGE_INTEGER with u64 " Kevin McKinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383018708-29615-4-git-send-email-klmckinney1@gmail.com \
--to=klmckinney1@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox