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 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.
Date: Mon, 28 Oct 2013 23:51:39 -0400 [thread overview]
Message-ID: <1383018708-29615-3-git-send-email-klmckinney1@gmail.com> (raw)
In-Reply-To: <1383018708-29615-1-git-send-email-klmckinney1@gmail.com>
This patch removes typedef for _U_IP_ADDRESS, and
changes the name of the struct to bcm_ip_address. In
addition, any calls to struct "U_IP_ADDRESS" are
changed to call directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
drivers/staging/bcm/Adapter.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 11fd7f1..33b5063 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -35,7 +35,7 @@ struct bcm_link_request {
#define MAX_PROTOCOL_LENGTH 32
#define IPV6_ADDRESS_SIZEINBYTES 0x10
-typedef union _U_IP_ADDRESS {
+union bcm_ip_address {
struct {
ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
@@ -52,7 +52,7 @@ typedef union _U_IP_ADDRESS {
UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
};
-} U_IP_ADDRESS;
+};
struct bcm_hdr_suppression_contextinfo {
UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
@@ -66,10 +66,10 @@ struct bcm_classifier_rule {
bool bUsed;
USHORT usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
- U_IP_ADDRESS stSrcIpAddress;
+ union bcm_ip_address stSrcIpAddress;
UCHAR ucIPSourceAddressLength; /* Ip Source Address Length */
- U_IP_ADDRESS stDestIpAddress;
+ union bcm_ip_address stDestIpAddress;
UCHAR ucIPDestinationAddressLength; /* Ip Destination Address Length */
UCHAR ucIPTypeOfServiceLength; /* Type of service Length */
UCHAR ucTosLow; /* Tos Low */
--
1.7.9.5
next prev parent reply other threads:[~2013-10-29 3:54 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 ` Kevin McKinney [this message]
2013-10-29 16:01 ` [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly 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 ` [PATCH 03/11 V2] Staging: bcm: Replace USHORT with unsigned short in Adapter.h Kevin McKinney
2013-10-29 3:51 ` [PATCH 04/11 V2] Staging: bcm: Replaces UCHAR with u8 " 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-3-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
Powered by JetHome