From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 19:27:56 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for TransportHeaderT and call directly.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c5485e9ca70b5bd5eabfc7c298f7e367062d4f56;p=deliverable%2Flinux.git

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

This patch removes typedef for TransportHeaderT, and
changes the name of the struct to bcm_transport_header.
In addition, any calls to struct "xporthdr" are
changed to call directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index adfa48d4da3c..9818128d9320 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -15,13 +15,12 @@ struct ArpHeader {
 	unsigned char ar_tip[4];	/* target IP address        */
 };
 
-struct TransportHeaderT {
+struct bcm_transport_header {
 	union {
 		struct udphdr uhdr;
 		struct tcphdr thdr;
 	};
 } __packed;
-typedef struct TransportHeaderT xporthdr;
 
 enum bcm_ip_frame_type {
 	eNonIPPacket,
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index cc2b1549b385..8d142a547e7f 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -208,12 +208,12 @@ static USHORT	IpVersion4(struct bcm_mini_adapter *Adapter,
 			   struct iphdr *iphd,
 			   struct bcm_classifier_rule *pstClassifierRule)
 {
-	xporthdr     		*xprt_hdr=NULL;
+	struct bcm_transport_header *xprt_hdr = NULL;
 	BOOLEAN	bClassificationSucceed=FALSE;
 
 	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "========>");
 
-	xprt_hdr=(xporthdr *)((PUCHAR)iphd + sizeof(struct iphdr));
+	xprt_hdr=(struct bcm_transport_header *)((PUCHAR)iphd + sizeof(struct iphdr));
 
 	do {
 		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Trying to see Direction = %d %d",