Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / drivers / staging / bcm / Protocol.h

diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index b8a4009bdf0cb74568ce20321cdc92db078b4a27..562d4dd81a7c13d18a564e791f3fff2014dae7bc 100644 (file)
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -55,7 +55,7 @@ typedef struct _S_ETHCS_PKT_INFO
 
 typedef struct _ETH_CS_802_Q_FRAME
 {
-       ETH_HEADER_STRUC EThHdr;
+       struct bcm_eth_header EThHdr;
        USHORT UserPriority:3;
        USHORT CFI:1;
        USHORT VLANID:12;
@@ -64,7 +64,7 @@ typedef struct _ETH_CS_802_Q_FRAME
 
 typedef struct _ETH_CS_802_LLC_FRAME
 {
-       ETH_HEADER_STRUC EThHdr;
+       struct bcm_eth_header EThHdr;
        unsigned char DSAP;
        unsigned char SSAP;
        unsigned char Control;
@@ -72,7 +72,7 @@ typedef struct _ETH_CS_802_LLC_FRAME
 
 typedef struct _ETH_CS_802_LLC_SNAP_FRAME
 {
-       ETH_HEADER_STRUC EThHdr;
+       struct bcm_eth_header EThHdr;
        unsigned char DSAP;
        unsigned char SSAP;
        unsigned char Control;
@@ -82,7 +82,7 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME
 
 typedef struct _ETH_CS_ETH2_FRAME
 {
-       ETH_HEADER_STRUC EThHdr;
+       struct bcm_eth_header EThHdr;
 } __attribute__((packed)) ETH_CS_ETH2_FRAME;
 
 #define ETHERNET_FRAMETYPE_IPV4                ntohs(0x0800)