Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / cnic_if.h

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index bc7000a..79443e0 100644 (file)
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION    "2.5.3"
-#define CNIC_MODULE_RELDATE    "June 6, 2011"
+#define CNIC_MODULE_VERSION    "2.5.7"
+#define CNIC_MODULE_RELDATE    "July 20, 2011"
 
 #define CNIC_ULP_RDMA          0
 #define CNIC_ULP_ISCSI         1
@@ -181,6 +181,11 @@ struct cnic_eth_dev {
        u32             max_fcoe_conn;
        u32             max_rdma_conn;
        u32             fcoe_init_cid;
+       u32             fcoe_wwn_port_name_hi;
+       u32             fcoe_wwn_port_name_lo;
+       u32             fcoe_wwn_node_name_hi;
+       u32             fcoe_wwn_node_name_lo;
+
        u16             iscsi_l2_client_id;
        u16             iscsi_l2_cid;
        u8              iscsi_mac[ETH_ALEN];
@@ -313,7 +318,7 @@ struct cnic_ulp_ops {
        void (*cnic_stop)(void *ulp_ctx);
        void (*indicate_kcqes)(void *ulp_ctx, struct kcqe *cqes[],
                                u32 num_cqes);
-       void (*indicate_netevent)(void *ulp_ctx, unsigned long event);
+       void (*indicate_netevent)(void *ulp_ctx, unsigned long event, u16 vid);
        void (*cm_connect_complete)(struct cnic_sock *);
        void (*cm_close_complete)(struct cnic_sock *);
        void (*cm_abort_complete)(struct cnic_sock *);