Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / enic / vnic_vic.h

diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
index 7e46e5e8600fedba6a2d7d6bcbf1276c279846cc..f700f5d9e81d8eb3f02305238484d69e1e71b7cc 100644 (file)
--- a/drivers/net/enic/vnic_vic.h
+++ b/drivers/net/enic/vnic_vic.h
@@ -24,14 +24,29 @@
 /* Note: String field lengths include null char */
 
 #define VIC_PROVINFO_CISCO_OUI         { 0x00, 0x00, 0x0c }
-#define VIC_PROVINFO_LINUX_TYPE                0x2
-
-enum vic_linux_prov_tlv_type {
-       VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
-       VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR = 1,                 /* u8[6] */
-       VIC_LINUX_PROV_TLV_CLIENT_NAME_STR = 2,
-       VIC_LINUX_PROV_TLV_HOST_UUID_STR = 8,
-       VIC_LINUX_PROV_TLV_CLIENT_UUID_STR = 9,
+#define VIC_PROVINFO_GENERIC_TYPE              0x4
+
+enum vic_generic_prov_tlv_type {
+       VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
+       VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR = 1,
+       VIC_GENERIC_PROV_TLV_CLIENT_NAME_STR = 2,
+       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_NAME_STR = 3,
+       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR = 4,
+       VIC_GENERIC_PROV_TLV_CLUSTER_UUID_STR = 5,
+       VIC_GENERIC_PROV_TLV_CLUSTER_NAME_STR = 7,
+       VIC_GENERIC_PROV_TLV_HOST_UUID_STR = 8,
+       VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR = 9,
+       VIC_GENERIC_PROV_TLV_INCARNATION_NUMBER = 10,
+       VIC_GENERIC_PROV_TLV_OS_TYPE = 11,
+       VIC_GENERIC_PROV_TLV_OS_VENDOR = 12,
+       VIC_GENERIC_PROV_TLV_CLIENT_TYPE = 15,
+};
+
+enum vic_generic_prov_os_type {
+       VIC_GENERIC_PROV_OS_TYPE_UNKNOWN = 0,
+       VIC_GENERIC_PROV_OS_TYPE_ESX = 1,
+       VIC_GENERIC_PROV_OS_TYPE_LINUX = 2,
+       VIC_GENERIC_PROV_OS_TYPE_WINDOWS = 3,
 };
 
 struct vic_provinfo {