diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
commit | 75329f1f0c0e2e2ad611734a2ef08309391a4d9f (patch) | |
tree | 67ca1a13f51fbf2f5af8557e6ff0bb722efab3e6 /drivers/net/cxgb3/cxgb3_ctl_defs.h | |
parent | b6b301aa9fba57b114c3a00f5f43abf672bd4ecd (diff) | |
parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
download | kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.tar.gz kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.tar.xz kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.zip |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_ctl_defs.h')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_ctl_defs.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/cxgb3/cxgb3_ctl_defs.h index 1d8d46eb3c9..369fe711fd7 100644 --- a/drivers/net/cxgb3/cxgb3_ctl_defs.h +++ b/drivers/net/cxgb3/cxgb3_ctl_defs.h @@ -57,6 +57,9 @@ enum { RDMA_GET_MIB = 19, GET_RX_PAGE_INFO = 50, + GET_ISCSI_IPV4ADDR = 51, + + GET_EMBEDDED_INFO = 70, }; /* @@ -86,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; /* @@ -169,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 */ |