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

[sfrench/cifs-2.6.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index ee01f5a6d0d4c540f4bfd49f097d2a8ac7445676..85f2a2e7030aa2e1962385f9c8e92a04e1aaa29d 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -33,8 +33,8 @@
 #include "vnic_rss.h"
 
 #define DRV_NAME               "enic"
-#define DRV_DESCRIPTION                "Cisco 10G Ethernet Driver"
-#define DRV_VERSION            "1.1.0.241a"
+#define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
+#define DRV_VERSION            "1.3.1.1-pp"
 #define DRV_COPYRIGHT          "Copyright 2008-2009 Cisco Systems, Inc"
 #define PFX                    DRV_NAME ": "
 
@@ -74,6 +74,13 @@ struct enic_msix_entry {
        void *devid;
 };
 
+struct enic_port_profile {
+       u8 request;
+       char name[PORT_PROFILE_MAX];
+       u8 instance_uuid[PORT_UUID_MAX];
+       u8 host_uuid[PORT_UUID_MAX];
+};
+
 /* Per-instance private data structure */
 struct enic {
        struct net_device *netdev;
@@ -95,6 +102,7 @@ struct enic {
        u32 port_mtu;
        u32 rx_coalesce_usecs;
        u32 tx_coalesce_usecs;
+       struct enic_port_profile pp;
 
        /* work queue cache line section */
        ____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];