diff --git a/[refs] b/[refs] index bdf7c3eabfd1..acc4d5a0688a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f05da951d41e69d0792922b2ca14342e1c220cd +refs/heads/master: 8ab19921143e69797343e972b16378171f37385a diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h index 494cdb1b5535..adfa48d4da3c 100644 --- a/trunk/drivers/staging/bcm/Protocol.h +++ b/trunk/drivers/staging/bcm/Protocol.h @@ -23,11 +23,11 @@ struct TransportHeaderT { } __packed; typedef struct TransportHeaderT xporthdr; -typedef enum _E_NWPKT_IPFRAME_TYPE { +enum bcm_ip_frame_type { eNonIPPacket, eIPv4Packet, eIPv6Packet -} E_NWPKT_IPFRAME_TYPE; +}; enum bcm_eth_frame_type { eEthUnsupportedFrame, @@ -38,7 +38,7 @@ enum bcm_eth_frame_type { }; struct bcm_eth_packet_info { - E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType; + enum bcm_ip_frame_type eNwpktIPFrameType; enum bcm_eth_frame_type eNwpktEthFrameType; unsigned short usEtherType; unsigned char ucDSAP;