Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-beck.git] / drivers / net / ethernet / emulex / benet / be_cmds.h

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 1b01e9b32794edb5d3f3df76cdab40818daf6160..a855668e0cc5dc2d9468c2c83907877e5795a5b6 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -84,6 +84,9 @@ struct be_mcc_compl {
 #define ASYNC_EVENT_QOS_SPEED          0x1
 #define ASYNC_EVENT_COS_PRIORITY       0x2
 #define ASYNC_EVENT_PVID_STATE         0x3
+#define ASYNC_EVENT_CODE_QNQ           0x6
+#define ASYNC_DEBUG_EVENT_TYPE_QNQ     1
+
 struct be_async_event_trailer {
        u32 code;
 };
@@ -144,6 +147,16 @@ struct be_async_event_grp5_pvid_state {
        struct be_async_event_trailer trailer;
 } __packed;
 
+/* async event indicating outer VLAN tag in QnQ */
+struct be_async_event_qnq {
+       u8 valid;       /* Indicates if outer VLAN is valid */
+       u8 rsvd0;
+       u16 vlan_tag;
+       u32 event_tag;
+       u8 rsvd1[4];
+       struct be_async_event_trailer trailer;
+} __packed;
+
 struct be_mcc_mailbox {
        struct be_mcc_wrb wrb;
        struct be_mcc_compl compl;