1 files changed, 34 insertions, 10 deletions

diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
index 7e46e5e8600f..9ef81f148351 100644
--- a/drivers/net/enic/vnic_vic.h
+++ b/drivers/net/enic/vnic_vic.h
@@ -24,14 +24,30 @@
 /* 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,
+        VIC_GENERIC_PROV_OS_TYPE_SOLARIS = 4,
 };
 
 struct vic_provinfo {
@@ -46,14 +62,22 @@ struct vic_provinfo {
         } tlv[0];
 } __packed;
 
+#define VIC_PROVINFO_ADD_TLV(vp, tlvtype, tlvlen, data) \
+        do { \
+                err = vic_provinfo_add_tlv(vp, tlvtype, tlvlen, data); \
+                if (err) \
+                        goto add_tlv_failure; \
+        } while (0)
+
 #define VIC_PROVINFO_MAX_DATA           1385
 #define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
         sizeof(struct vic_provinfo))
 
-struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type);
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
+        const u8 type);
 void vic_provinfo_free(struct vic_provinfo *vp);
 int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
-        void *value);
+        const void *value);
 size_t vic_provinfo_size(struct vic_provinfo *vp);
 
 #endif  /* _VNIC_VIC_H_ */