Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353812
b: refs/heads/master
c: a348927
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 8fe7575 commit d9f1fe4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: bd33dd31f755331141a71b082c5f15b5ee722b37
refs/heads/master: a3489276ec02e0d3dbc6723f89041187d9a6cf76
10 changes: 5 additions & 5 deletions trunk/drivers/staging/bcm/Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct ArpHeader {
unsigned char ar_sip[4]; /* sender IP address */
unsigned char ar_tha[ETH_ALEN]; /* target hardware address */
unsigned char ar_tip[4]; /* target IP address */
} /*__attribute__((packed))*/;
};

struct TransportHeaderT
{
Expand Down Expand Up @@ -85,7 +85,7 @@ typedef struct _ETH_CS_ETH2_FRAME
#define ETHERNET_FRAMETYPE_IPV6 ntohs(0x86dd)
#define ETHERNET_FRAMETYPE_802QVLAN ntohs(0x8100)

//Per SF CS Specification Encodings
/* Per SF CS Specification Encodings */
typedef enum _E_SERVICEFLOW_CS_SPEC_
{
eCSSpecUnspecified = 0,
Expand Down Expand Up @@ -119,7 +119,7 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_
#define ARP_OP_REPLY 0x02
#define ARP_PKT_SIZE 60

// This is the format for the TCP packet header
/* This is the format for the TCP packet header */
typedef struct _TCP_HEADER
{
USHORT usSrcPort;
Expand All @@ -134,7 +134,7 @@ typedef struct _TCP_HEADER
} TCP_HEADER, *PTCP_HEADER;

#define TCP_HEADER_LEN sizeof(TCP_HEADER)
#define TCP_ACK 0x10 //Bit 4 in tcpflags field.
#define TCP_ACK 0x10 /* Bit 4 in tcpflags field. */
#define GET_TCP_HEADER_LEN(byte) ((byte&0xF0)>>4)

#endif //__PROTOCOL_H__
#endif /* __PROTOCOL_H__ */

0 comments on commit d9f1fe4

Please sign in to comment.