Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353813
b: refs/heads/master
c: 3df56e1
h: refs/heads/master
i:
  353811: 8fe7575
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent d9f1fe4 commit 0530e31
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 23 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: a3489276ec02e0d3dbc6723f89041187d9a6cf76
refs/heads/master: 3df56e1066f88f97a602de2182a9236b8464f41b
33 changes: 11 additions & 22 deletions trunk/drivers/staging/bcm/Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,51 @@ struct ArpHeader {
unsigned char ar_tip[4]; /* target IP address */
};

struct TransportHeaderT
{
union
{
struct TransportHeaderT {
union {
struct udphdr uhdr;
struct tcphdr thdr;
};
} __attribute__((packed));
typedef struct TransportHeaderT xporthdr;

typedef enum _E_NWPKT_IPFRAME_TYPE
{
typedef enum _E_NWPKT_IPFRAME_TYPE {
eNonIPPacket,
eIPv4Packet,
eIPv6Packet
} E_NWPKT_IPFRAME_TYPE;

typedef enum _E_NWPKT_ETHFRAME_TYPE
{
typedef enum _E_NWPKT_ETHFRAME_TYPE {
eEthUnsupportedFrame,
eEth802LLCFrame,
eEth802LLCSNAPFrame,
eEth802QVLANFrame,
eEthOtherFrame
} E_NWPKT_ETHFRAME_TYPE;

typedef struct _S_ETHCS_PKT_INFO
{
typedef struct _S_ETHCS_PKT_INFO {
E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
USHORT usEtherType;
UCHAR ucDSAP;
} S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;

typedef struct _ETH_CS_802_Q_FRAME
{
typedef struct _ETH_CS_802_Q_FRAME {
struct bcm_eth_header EThHdr;
USHORT UserPriority:3;
USHORT CFI:1;
USHORT VLANID:12;
USHORT EthType;
} __attribute__((packed)) ETH_CS_802_Q_FRAME;

typedef struct _ETH_CS_802_LLC_FRAME
{
typedef struct _ETH_CS_802_LLC_FRAME {
struct bcm_eth_header EThHdr;
unsigned char DSAP;
unsigned char SSAP;
unsigned char Control;
} __attribute__((packed)) ETH_CS_802_LLC_FRAME;

typedef struct _ETH_CS_802_LLC_SNAP_FRAME
{
typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
struct bcm_eth_header EThHdr;
unsigned char DSAP;
unsigned char SSAP;
Expand All @@ -76,8 +68,7 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME
unsigned short usEtherType;
} __attribute__((packed)) ETH_CS_802_LLC_SNAP_FRAME;

typedef struct _ETH_CS_ETH2_FRAME
{
typedef struct _ETH_CS_ETH2_FRAME {
struct bcm_eth_header EThHdr;
} __attribute__((packed)) ETH_CS_ETH2_FRAME;

Expand All @@ -86,8 +77,7 @@ typedef struct _ETH_CS_ETH2_FRAME
#define ETHERNET_FRAMETYPE_802QVLAN ntohs(0x8100)

/* Per SF CS Specification Encodings */
typedef enum _E_SERVICEFLOW_CS_SPEC_
{
typedef enum _E_SERVICEFLOW_CS_SPEC_ {
eCSSpecUnspecified = 0,
eCSPacketIPV4,
eCSPacketIPV6,
Expand Down Expand Up @@ -120,8 +110,7 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_
#define ARP_PKT_SIZE 60

/* This is the format for the TCP packet header */
typedef struct _TCP_HEADER
{
typedef struct _TCP_HEADER {
USHORT usSrcPort;
USHORT usDestPort;
ULONG ulSeqNumber;
Expand Down

0 comments on commit 0530e31

Please sign in to comment.