Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h
index 810287beff14..e0a73f1ca6f4 100644
--- a/drivers/net/enic/vnic_resource.h
+++ b/drivers/net/enic/vnic_resource.h
@@ -22,6 +22,11 @@
 
 #define VNIC_RES_MAGIC          0x766E6963L     /* 'vnic' */
 #define VNIC_RES_VERSION        0x00000000L
+#define MGMTVNIC_MAGIC          0x544d474dL     /* 'MGMT' */
+#define MGMTVNIC_VERSION        0x00000000L
+
+/* The MAC address assigned to the CFG vNIC is fixed. */
+#define MGMTVNIC_MAC            { 0x02, 0x00, 0x54, 0x4d, 0x47, 0x4d }
 
 /* vNIC resource types */
 enum vnic_res_type {
@@ -52,6 +57,14 @@ struct vnic_resource_header {
         u32 version;
 };
 
+struct mgmt_barmap_hdr {
+        u32 magic;                      /* magic number */
+        u32 version;                    /* header format version */
+        u16 lif;                        /* loopback lif for mgmt frames */
+        u16 pci_slot;                   /* installed pci slot */
+        char serial[16];                /* card serial number */
+};
+
 struct vnic_resource {
         u8 type;
         u8 bar;