[ofa-general] [PATCH] opensm: consolidate osm_sa_vendor_send() status check
Sasha Khapyorsky
sashak at voltaire.com
Sat Mar 1 13:05:09 PST 2008
Consolidate osm_sa_vendor_send() status check and error message log in
case of failure.
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
opensm/opensm/osm_inform.c | 10 ++--------
opensm/opensm/osm_sa.c | 6 +++++-
opensm/opensm/osm_sa_class_port_info.c | 10 +---------
opensm/opensm/osm_sa_guidinfo_record.c | 10 +---------
opensm/opensm/osm_sa_informinfo.c | 21 ++-------------------
opensm/opensm/osm_sa_lft_record.c | 10 +---------
opensm/opensm/osm_sa_link_record.c | 10 +---------
opensm/opensm/osm_sa_mcmember_record.c | 20 ++------------------
opensm/opensm/osm_sa_mft_record.c | 10 +---------
opensm/opensm/osm_sa_multipath_record.c | 10 +---------
opensm/opensm/osm_sa_node_record.c | 10 +---------
opensm/opensm/osm_sa_path_record.c | 10 +---------
opensm/opensm/osm_sa_pkey_record.c | 9 +--------
opensm/opensm/osm_sa_portinfo_record.c | 9 +--------
opensm/opensm/osm_sa_response.c | 12 ++----------
opensm/opensm/osm_sa_service_record.c | 11 +----------
opensm/opensm/osm_sa_slvl_record.c | 9 +--------
opensm/opensm/osm_sa_sminfo_record.c | 8 +-------
opensm/opensm/osm_sa_sw_info_record.c | 10 +---------
opensm/opensm/osm_sa_vlarb_record.c | 9 +--------
20 files changed, 28 insertions(+), 186 deletions(-)
diff --git a/opensm/opensm/osm_inform.c b/opensm/opensm/osm_inform.c
index 9409a04..bbd573c 100644
--- a/opensm/opensm/osm_inform.c
+++ b/opensm/opensm/osm_inform.c
@@ -365,14 +365,8 @@ static ib_api_status_t __osm_send_report(IN osm_infr_t * p_infr_rec, /* the info
*p_report_ntc = *p_ntc;
/* The TRUE is for: response is expected */
- status = osm_sa_vendor_send(p_report_madw->h_bind, p_report_madw, TRUE,
- p_infr_rec->sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 0204: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_report_madw->h_bind, p_report_madw, TRUE,
+ p_infr_rec->sa->p_subn);
Exit:
OSM_LOG_EXIT(p_log);
diff --git a/opensm/opensm/osm_sa.c b/opensm/opensm/osm_sa.c
index 9dbab9d..498bae8 100644
--- a/opensm/opensm/osm_sa.c
+++ b/opensm/opensm/osm_sa.c
@@ -327,8 +327,12 @@ osm_sa_vendor_send(IN osm_bind_handle_t h_bind,
cl_atomic_inc(&p_subn->p_osm->stats.sa_mads_sent);
status = osm_vendor_send(h_bind, p_madw, resp_expected);
- if (status != IB_SUCCESS)
+ if (status != IB_SUCCESS) {
cl_atomic_dec(&p_subn->p_osm->stats.sa_mads_sent);
+ OSM_LOG(&p_subn->p_osm->log, OSM_LOG_ERROR, "ERR 4C04: "
+ "osm_vendor_send failed, status = %s\n",
+ ib_get_err_str(status));
+ }
return status;
}
diff --git a/opensm/opensm/osm_sa_class_port_info.c b/opensm/opensm/osm_sa_class_port_info.c
index 744c97d..4232fce 100644
--- a/opensm/opensm/osm_sa_class_port_info.c
+++ b/opensm/opensm/osm_sa_class_port_info.c
@@ -80,7 +80,6 @@ __osm_cpi_rcv_respond(IN osm_sa_t * sa,
const ib_sa_mad_t *p_sa_mad;
ib_sa_mad_t *p_resp_sa_mad;
ib_class_port_info_t *p_resp_cpi;
- ib_api_status_t status;
ib_gid_t zero_gid;
uint8_t rtv;
@@ -176,14 +175,7 @@ __osm_cpi_rcv_respond(IN osm_sa_t * sa,
if (osm_log_is_active(sa->p_log, OSM_LOG_FRAMES))
osm_dump_sa_mad(sa->p_log, p_resp_sa_mad, OSM_LOG_FRAMES);
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1409: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_guidinfo_record.c b/opensm/opensm/osm_sa_guidinfo_record.c
index c6baadd..8bdc136 100644
--- a/opensm/opensm/osm_sa_guidinfo_record.c
+++ b/opensm/opensm/osm_sa_guidinfo_record.c
@@ -324,7 +324,6 @@ void osm_gir_rcv_process(IN void *ctx, IN void *data)
uint32_t i;
osm_gir_search_ctxt_t context;
osm_gir_item_t *p_rec_item;
- ib_api_status_t status;
osm_physp_t *p_req_physp;
CL_ASSERT(sa);
@@ -502,14 +501,7 @@ void osm_gir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 5107: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_informinfo.c b/opensm/opensm/osm_sa_informinfo.c
index 286a348..79e6e54 100644
--- a/opensm/opensm/osm_sa_informinfo.c
+++ b/opensm/opensm/osm_sa_informinfo.c
@@ -224,7 +224,6 @@ __osm_infr_rcv_respond(IN osm_sa_t * sa,
const ib_sa_mad_t *p_sa_mad;
ib_sa_mad_t *p_resp_sa_mad;
ib_inform_info_t *p_resp_infr;
- ib_api_status_t status;
OSM_LOG_ENTER(sa->p_log);
@@ -257,15 +256,7 @@ __osm_infr_rcv_respond(IN osm_sa_t * sa,
p_resp_infr =
(ib_inform_info_t *) ib_sa_mad_get_payload_ptr(p_resp_sa_mad);
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 4304: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
@@ -375,7 +366,6 @@ osm_infr_rcv_process_get_method(IN osm_sa_t * sa,
uint32_t i, j;
osm_iir_search_ctxt_t context;
osm_iir_item_t *p_rec_item;
- ib_api_status_t status = IB_SUCCESS;
osm_physp_t *p_req_physp;
OSM_LOG_ENTER(sa->p_log);
@@ -551,14 +541,7 @@ osm_infr_rcv_process_get_method(IN osm_sa_t * sa,
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 430C: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_lft_record.c b/opensm/opensm/osm_sa_lft_record.c
index 10c0e71..b3d118d 100644
--- a/opensm/opensm/osm_sa_lft_record.c
+++ b/opensm/opensm/osm_sa_lft_record.c
@@ -230,7 +230,6 @@ void osm_lftr_rcv_process(IN void *ctx, IN void *data)
uint32_t i;
osm_lftr_search_ctxt_t context;
osm_lftr_item_t *p_rec_item;
- ib_api_status_t status = IB_SUCCESS;
osm_physp_t *p_req_physp;
CL_ASSERT(sa);
@@ -406,14 +405,7 @@ void osm_lftr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 4411: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_link_record.c b/opensm/opensm/osm_sa_link_record.c
index 1f88d0e..d3b0a73 100644
--- a/opensm/opensm/osm_sa_link_record.c
+++ b/opensm/opensm/osm_sa_link_record.c
@@ -456,7 +456,6 @@ __osm_lr_rcv_respond(IN osm_sa_t * sa,
size_t trim_num_rec;
#endif
ib_link_record_t *p_resp_lr;
- ib_api_status_t status;
osm_lr_item_t *p_lr_item;
const ib_sa_mad_t *p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
@@ -573,14 +572,7 @@ __osm_lr_rcv_respond(IN osm_sa_t * sa,
}
}
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1803: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_mcmember_record.c b/opensm/opensm/osm_sa_mcmember_record.c
index 63202e8..50d281f 100644
--- a/opensm/opensm/osm_sa_mcmember_record.c
+++ b/opensm/opensm/osm_sa_mcmember_record.c
@@ -347,7 +347,6 @@ __osm_mcmr_rcv_respond(IN osm_sa_t * sa,
osm_madw_t *p_resp_madw;
ib_sa_mad_t *p_sa_mad, *p_resp_sa_mad;
ib_member_rec_t *p_resp_mcmember_rec;
- ib_api_status_t status;
OSM_LOG_ENTER(sa->p_log);
@@ -395,14 +394,7 @@ __osm_mcmr_rcv_respond(IN osm_sa_t * sa,
p_resp_mcmember_rec->pkt_life &= 0x3f;
p_resp_mcmember_rec->pkt_life |= 2 << 6; /* exactly */
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1B07: "
- "Unable to send MAD (%s) for TID <0x%" PRIx64 ">\n",
- ib_get_err_str(status), p_resp_sa_mad->trans_id);
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
@@ -1861,7 +1853,6 @@ __osm_mcmr_query_mgrp(IN osm_sa_t * sa,
uint32_t i;
osm_sa_mcmr_search_ctxt_t context;
osm_mcmr_item_t *p_rec_item;
- ib_api_status_t status;
ib_net64_t comp_mask;
osm_physp_t *p_req_physp;
boolean_t trusted_req;
@@ -2038,14 +2029,7 @@ __osm_mcmr_query_mgrp(IN osm_sa_t * sa,
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1B17: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_mft_record.c b/opensm/opensm/osm_sa_mft_record.c
index a5d1292..c1990e6 100644
--- a/opensm/opensm/osm_sa_mft_record.c
+++ b/opensm/opensm/osm_sa_mft_record.c
@@ -261,7 +261,6 @@ void osm_mftr_rcv_process(IN void *ctx, IN void *data)
uint32_t i;
osm_mftr_search_ctxt_t context;
osm_mftr_item_t *p_rec_item;
- ib_api_status_t status = IB_SUCCESS;
osm_physp_t *p_req_physp;
CL_ASSERT(sa);
@@ -437,14 +436,7 @@ void osm_mftr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 4A11: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_multipath_record.c b/opensm/opensm/osm_sa_multipath_record.c
index 98a2da1..7e0ff53 100644
--- a/opensm/opensm/osm_sa_multipath_record.c
+++ b/opensm/opensm/osm_sa_multipath_record.c
@@ -1465,7 +1465,6 @@ __osm_mpr_rcv_respond(IN osm_sa_t * sa,
size_t mad_size;
ib_path_rec_t *p_resp_pr;
ib_multipath_rec_t *p_mpr;
- ib_api_status_t status;
osm_mpr_item_t *p_mpr_item;
uint32_t i;
@@ -1537,14 +1536,7 @@ __osm_mpr_rcv_respond(IN osm_sa_t * sa,
osm_dump_sa_mad(sa->p_log, p_resp_sa_mad, OSM_LOG_FRAMES);
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 4507: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_node_record.c b/opensm/opensm/osm_sa_node_record.c
index ab5e3a6..21d439f 100644
--- a/opensm/opensm/osm_sa_node_record.c
+++ b/opensm/opensm/osm_sa_node_record.c
@@ -326,7 +326,6 @@ void osm_nr_rcv_process(IN void *ctx, IN void *data)
uint32_t i;
osm_nr_search_ctxt_t context;
osm_nr_item_t *p_rec_item;
- ib_api_status_t status;
osm_physp_t *p_req_physp;
CL_ASSERT(sa);
@@ -493,14 +492,7 @@ void osm_nr_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1D07: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c
index f94145b..a570c92 100644
--- a/opensm/opensm/osm_sa_path_record.c
+++ b/opensm/opensm/osm_sa_path_record.c
@@ -1658,7 +1658,6 @@ __osm_pr_rcv_respond(IN osm_sa_t * sa,
size_t trim_num_rec;
#endif
ib_path_rec_t *p_resp_pr;
- ib_api_status_t status;
const ib_sa_mad_t *sad_mad = osm_madw_get_sa_mad_ptr(p_madw);
osm_pr_item_t *p_pr_item;
uint32_t i;
@@ -1777,14 +1776,7 @@ __osm_pr_rcv_respond(IN osm_sa_t * sa,
CL_ASSERT(cl_is_qlist_empty(p_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1F15: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_pkey_record.c b/opensm/opensm/osm_sa_pkey_record.c
index adfd5c8..769d3df 100644
--- a/opensm/opensm/osm_sa_pkey_record.c
+++ b/opensm/opensm/osm_sa_pkey_record.c
@@ -481,14 +481,7 @@ void osm_pkey_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 4607: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_portinfo_record.c b/opensm/opensm/osm_sa_portinfo_record.c
index 3e866f3..df46139 100644
--- a/opensm/opensm/osm_sa_portinfo_record.c
+++ b/opensm/opensm/osm_sa_portinfo_record.c
@@ -726,14 +726,7 @@ void osm_pir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2107: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_response.c b/opensm/opensm/osm_sa_response.c
index 7db3927..6477aca 100644
--- a/opensm/opensm/osm_sa_response.c
+++ b/opensm/opensm/osm_sa_response.c
@@ -67,7 +67,6 @@ osm_sa_send_error(IN osm_sa_t * sa,
osm_madw_t *p_resp_madw;
ib_sa_mad_t *p_resp_sa_mad;
ib_sa_mad_t *p_sa_mad;
- ib_api_status_t status;
OSM_LOG_ENTER(sa->p_log);
@@ -115,15 +114,8 @@ osm_sa_send_error(IN osm_sa_t * sa,
if (osm_log_is_active(sa->p_log, OSM_LOG_FRAMES))
osm_dump_sa_mad(sa->p_log, p_resp_sa_mad, OSM_LOG_FRAMES);
- status = osm_sa_vendor_send(osm_madw_get_bind_handle(p_resp_madw),
- p_resp_madw, FALSE, sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2302: "
- "Error sending MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- goto Exit;
- }
+ osm_sa_vendor_send(osm_madw_get_bind_handle(p_resp_madw),
+ p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_service_record.c b/opensm/opensm/osm_sa_service_record.c
index 1680ea1..434ccec 100644
--- a/opensm/opensm/osm_sa_service_record.c
+++ b/opensm/opensm/osm_sa_service_record.c
@@ -222,7 +222,6 @@ __osm_sr_rcv_respond(IN osm_sa_t * sa,
uint32_t trim_num_rec;
#endif
ib_service_record_t *p_resp_sr;
- ib_api_status_t status;
osm_sr_item_t *p_sr_item;
const ib_sa_mad_t *p_rcvd_mad = osm_madw_get_sa_mad_ptr(p_madw);
boolean_t trusted_req = TRUE;
@@ -362,15 +361,7 @@ __osm_sr_rcv_respond(IN osm_sa_t * sa,
}
}
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
-
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2407: "
- "Unable to send MAD (%s)\n", ib_get_err_str(status));
- /* osm_mad_pool_put( sa->p_mad_pool, p_resp_madw ); */
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_slvl_record.c b/opensm/opensm/osm_sa_slvl_record.c
index 9b587a5..9247fa6 100644
--- a/opensm/opensm/osm_sa_slvl_record.c
+++ b/opensm/opensm/osm_sa_slvl_record.c
@@ -455,14 +455,7 @@ void osm_slvl_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2606: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_sminfo_record.c b/opensm/opensm/osm_sa_sminfo_record.c
index 5527892..0127077 100644
--- a/opensm/opensm/osm_sa_sminfo_record.c
+++ b/opensm/opensm/osm_sa_sminfo_record.c
@@ -476,13 +476,7 @@ void osm_smir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2802: "
- "Error sending MAD (%s)\n", ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_sw_info_record.c b/opensm/opensm/osm_sa_sw_info_record.c
index 79f7a19..3ed37ad 100644
--- a/opensm/opensm/osm_sa_sw_info_record.c
+++ b/opensm/opensm/osm_sa_sw_info_record.c
@@ -256,7 +256,6 @@ void osm_sir_rcv_process(IN void *ctx, IN void *data)
uint32_t i;
osm_sir_search_ctxt_t context;
osm_sir_item_t *p_rec_item;
- ib_api_status_t status;
osm_physp_t *p_req_physp;
CL_ASSERT(sa);
@@ -428,14 +427,7 @@ void osm_sir_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 5307: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
diff --git a/opensm/opensm/osm_sa_vlarb_record.c b/opensm/opensm/osm_sa_vlarb_record.c
index 7b022aa..29bbba2 100644
--- a/opensm/opensm/osm_sa_vlarb_record.c
+++ b/opensm/opensm/osm_sa_vlarb_record.c
@@ -472,14 +472,7 @@ void osm_vlarb_rec_rcv_process(IN void *ctx, IN void *data)
CL_ASSERT(cl_is_qlist_empty(&rec_list));
- status = osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE,
- sa->p_subn);
- if (status != IB_SUCCESS) {
- OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 2A07: "
- "osm_sa_vendor_send status = %s\n",
- ib_get_err_str(status));
- goto Exit;
- }
+ osm_sa_vendor_send(p_resp_madw->h_bind, p_resp_madw, FALSE, sa->p_subn);
Exit:
OSM_LOG_EXIT(sa->p_log);
--
1.5.4.1.122.gaa8d
More information about the general
mailing list