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

[safe/jmp/linux-2.6] / drivers / net / cxgb3 / cxgb3_ctl_defs.h

diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/cxgb3/cxgb3_ctl_defs.h
index 6c4f320..369fe71 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_ctl_defs.h
+++ b/drivers/net/cxgb3/cxgb3_ctl_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -54,8 +54,12 @@ enum {
        RDMA_CQ_DISABLE         = 16,
        RDMA_CTRL_QP_SETUP      = 17,
        RDMA_GET_MEM            = 18,
+       RDMA_GET_MIB            = 19,
 
        GET_RX_PAGE_INFO        = 50,
+       GET_ISCSI_IPV4ADDR      = 51,
+
+       GET_EMBEDDED_INFO       = 70,
 };
 
 /*
@@ -85,6 +89,12 @@ struct iff_mac {
        u16 vlan_tag;
 };
 
+/* Structure used to request a port's iSCSI IPv4 address */
+struct iscsi_ipv4addr {
+       struct net_device *dev; /* the net_device */
+       __be32 ipv4addr;        /* the return iSCSI IPv4 address */
+};
+
 struct pci_dev;
 
 /*
@@ -110,10 +120,7 @@ struct ulp_iscsi_info {
        unsigned int llimit;
        unsigned int ulimit;
        unsigned int tagmask;
-       unsigned int pgsz3;
-       unsigned int pgsz2;
-       unsigned int pgsz1;
-       unsigned int pgsz0;
+       u8 pgsz_factor[4];
        unsigned int max_rxsz;
        unsigned int max_txsz;
        struct pci_dev *pdev;
@@ -171,4 +178,12 @@ struct ofld_page_info {
        unsigned int page_size;  /* Page size, should be a power of 2 */
        unsigned int num;        /* Number of pages */
 };
+
+/*
+ * Structure used to get firmware and protocol engine versions.
+ */
+struct ch_embedded_info {
+       u32 fw_vers;
+       u32 tp_vers;
+};
 #endif                         /* _CXGB3_OFFLOAD_CTL_DEFS_H */