Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353828
b: refs/heads/master
c: c5485e9
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 0809c67 commit 742b8bf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ab19921143e69797343e972b16378171f37385a
refs/heads/master: c5485e9ca70b5bd5eabfc7c298f7e367062d4f56
3 changes: 1 addition & 2 deletions trunk/drivers/staging/bcm/Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/Qos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 742b8bf

Please sign in to comment.