diff --git a/[refs] b/[refs] index 27f5d6cb9038..bdf7c3eabfd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fa9ac457334a172255d9765b65b9340a085990a +refs/heads/master: 1f05da951d41e69d0792922b2ca14342e1c220cd diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h index f6d8d6337ff0..494cdb1b5535 100644 --- a/trunk/drivers/staging/bcm/Protocol.h +++ b/trunk/drivers/staging/bcm/Protocol.h @@ -29,17 +29,17 @@ typedef enum _E_NWPKT_IPFRAME_TYPE { eIPv6Packet } E_NWPKT_IPFRAME_TYPE; -typedef enum _E_NWPKT_ETHFRAME_TYPE { +enum bcm_eth_frame_type { eEthUnsupportedFrame, eEth802LLCFrame, eEth802LLCSNAPFrame, eEth802QVLANFrame, eEthOtherFrame -} E_NWPKT_ETHFRAME_TYPE; +}; struct bcm_eth_packet_info { E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType; - E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType; + enum bcm_eth_frame_type eNwpktEthFrameType; unsigned short usEtherType; unsigned char ucDSAP; };