From 742b8bfc194662dc8176e659c5a69c88f8ae89b4 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sat, 22 Dec 2012 14:27:56 -0500 Subject: [PATCH] --- yaml --- r: 353828 b: refs/heads/master c: c5485e9ca70b5bd5eabfc7c298f7e367062d4f56 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Protocol.h | 3 +-- trunk/drivers/staging/bcm/Qos.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index acc4d5a0688a..ea4dc518e35a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ab19921143e69797343e972b16378171f37385a +refs/heads/master: c5485e9ca70b5bd5eabfc7c298f7e367062d4f56 diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h index adfa48d4da3c..9818128d9320 100644 --- a/trunk/drivers/staging/bcm/Protocol.h +++ b/trunk/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/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c index cc2b1549b385..8d142a547e7f 100644 --- a/trunk/drivers/staging/bcm/Qos.c +++ b/trunk/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",