diff options
Diffstat (limited to 'usr/src/uts/common/sys/ib')
6 files changed, 9 insertions, 11 deletions
diff --git a/usr/src/uts/common/sys/ib/clients/of/sol_uverbs/sol_uverbs_qp.h b/usr/src/uts/common/sys/ib/clients/of/sol_uverbs/sol_uverbs_qp.h index ca6665b83a..03f49b3b3c 100644 --- a/usr/src/uts/common/sys/ib/clients/of/sol_uverbs/sol_uverbs_qp.h +++ b/usr/src/uts/common/sys/ib/clients/of/sol_uverbs/sol_uverbs_qp.h @@ -41,7 +41,7 @@ extern "C" { * Definitions */ #define IBT_TO_OFA_QP_STATE(_state) ((_state) < IBT_STATE_SQDRAIN ? \ - (_state) : IBT_STATE_SQD) + (enum ib_qp_state)(_state) : IB_QPS_SQD) /* * Structures diff --git a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h index 5e2f419600..164af2aa7a 100644 --- a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h +++ b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h @@ -75,8 +75,6 @@ #ifndef _RDSIB_BUF_H #define _RDSIB_BUF_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -149,8 +147,8 @@ typedef struct rds_bufpool_s { } rds_bufpool_t; /* Global pools of buffers */ -rds_bufpool_t rds_dpool; /* data pool */ -rds_bufpool_t rds_cpool; /* ctrl pool */ +extern rds_bufpool_t rds_dpool; /* data pool */ +extern rds_bufpool_t rds_cpool; /* ctrl pool */ /* defined in rds_buf.c */ int rds_init_recv_caches(rds_state_t *statep); diff --git a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h index 56b92f8037..c462306418 100644 --- a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h +++ b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h @@ -117,7 +117,7 @@ typedef unsigned int atomic_t; #define clear_le_bit(b, p) clear_bit(b ^ LE_BIT_XOR, p) #define test_le_bit(b, p) test_bit(b ^ LE_BIT_XOR, p) -uint_t rdsv3_one_sec_in_hz; +extern uint_t rdsv3_one_sec_in_hz; #define jiffies 100 #define HZ (drv_hztousec(1)) diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex.h b/usr/src/uts/common/sys/ib/ibnex/ibnex.h index f2928d8f4b..3b12a499fc 100644 --- a/usr/src/uts/common/sys/ib/ibnex/ibnex.h +++ b/usr/src/uts/common/sys/ib/ibnex/ibnex.h @@ -263,7 +263,7 @@ typedef struct ibnex_s { IBNEX_MAX_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN #define IBNEX_MAX_IBPORT_COMPAT_PROP_SZ \ IBNEX_MAX_IBPORT_COMPAT_NAMES * IBNEX_MAX_COMPAT_LEN -#define IBNEX_DEVFS_ENUMERATE 0x1 /* enumerate via devfs(7fs) */ +#define IBNEX_DEVFS_ENUMERATE 0x1 /* enumerate via devfs(4FS) */ #define IBNEX_CFGADM_ENUMERATE 0x2 /* enumerate via cfgadm */ #define IBNEX_MAX_NODEADDR_SZ 35 diff --git a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h index c82b43b5a5..8d74d61c86 100644 --- a/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h +++ b/usr/src/uts/common/sys/ib/ibnex/ibnex_devctl.h @@ -82,14 +82,14 @@ typedef enum ib_service_type_e { #define IBNEX_NODE_COND_NVL "node_condition" /* - * This flag is passed from cfgadm to ib(7d) to convey that it + * This flag is passed from cfgadm to ib(4D) to convey that it * need not attempt to probe the fabric. * * The value of these flags should be same as flags in enum * ibdm_ibnex_get_ioclist_mtd_t. */ #define IBNEX_DONOT_PROBE_FLAG 1 -#define IBNEX_NORMAL_PROBE 0 /* flag used by ib(7d) only */ +#define IBNEX_NORMAL_PROBE 0 /* flag used by ib(4D) only */ /* * The following are sub-commands to DEVCTL_AP_CONTROL. diff --git a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h index 824d692306..4acabc9e86 100644 --- a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h +++ b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_ibnex.h @@ -118,7 +118,7 @@ void ibtl_ibnex_unregister_callback(); * alternate_HCA database * IBTL_IBNEX_UNCFG_CLNTS_FLAG - Build client devpaths/ * ap_id database - * callback - Callback function to get ap_id from ib(7d) + * callback - Callback function to get ap_id from ib(4D) * Output: * buffer - The information is returned in this buffer * bufsiz - The size of the information buffer @@ -192,7 +192,7 @@ ibt_status_t ibtl_ibnex_get_hca_verbose_data(ib_guid_t, char **, size_t *); * registered HCAs's dip. If match found return IBT_SUCCESS, * else IBT_NO_HCAS_AVAILABLE. * For IOC/Pseudo devices check if the given pdip is that of - * the ib(7d) nexus. If yes return IBT_SUCCESS, + * the ib(4D) nexus. If yes return IBT_SUCCESS, * else IBT_NO_HCAS_AVAILABLE. */ ibt_status_t ibtl_ibnex_valid_hca_parent(dev_info_t *); |