[openib-general] [PATCH 1/2] osm: osmtest ignores error status

[Yevgeny Kliteynik]

Hi Hal.

This patch takes care of several cases where osmtest
ignored error status.

Yevgeny

Signed-off-by:  Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>

Index: osmt_slvl_vl_arb.c
===================================================================
--- osmt_slvl_vl_arb.c	(revision 9661)
+++ osmt_slvl_vl_arb.c	(working copy)
@@ -164,12 +164,9 @@ osmt_query_vl_arb(
 
   if( status != IB_SUCCESS )
   {
-    if (status != IB_INVALID_PARAMETER)
-    {
-      osm_log( &p_osmt->log, OSM_LOG_ERROR,
-               "osmt_query_vl_arb: ERR 0466: "
-               "ib_query failed (%s)\n", ib_get_err_str( status ) );
-    }
+    osm_log( &p_osmt->log, OSM_LOG_ERROR,
+             "osmt_query_vl_arb: ERR 0466: "
+             "ib_query failed (%s)\n", ib_get_err_str( status ) );
 
     if( status == IB_REMOTE_ERROR )
     {
@@ -385,12 +382,9 @@ osmt_query_slvl_map(
 
   if( status != IB_SUCCESS )
   {
-    if (status != IB_INVALID_PARAMETER)
-    {
-      osm_log( &p_osmt->log, OSM_LOG_ERROR,
-               "osmt_query_slvl_map: ERR 0470: "
-               "ib_query failed (%s)\n", ib_get_err_str( status ) );
-    }
+    osm_log( &p_osmt->log, OSM_LOG_ERROR,
+             "osmt_query_slvl_map: ERR 0470: "
+             "ib_query failed (%s)\n", ib_get_err_str( status ) );
 
     if( status == IB_REMOTE_ERROR )
     {
Index: osmt_inform.c
===================================================================
--- osmt_inform.c	(revision 9661)
+++ osmt_inform.c	(working copy)
@@ -103,6 +103,7 @@ osmt_bind_inform_qp( IN osmtest_t * cons
     osm_log( p_log, OSM_LOG_ERROR,
              "osmt_bind_inform_qp: ERR 0109: "
              "Unable to obtain CA and port (%d).\n" );
+    status = IB_ERROR;
     goto Exit;
   }
 
@@ -579,6 +580,7 @@ osmt_send_trap_wait_for_forward( IN osmt
                "Did not receive a Report(Notice) but attr:%d\n",
                cl_ntoh16(p_sa_mad->attr_id)
                );
+      status = IB_ERROR;
     }
   }
   else
@@ -588,6 +590,7 @@ osmt_send_trap_wait_for_forward( IN osmt
              "Received an Unexpected Method:%d\n",
              p_smp->method
              );
+    status = IB_ERROR;
   }
 
  Exit:
@@ -666,6 +669,7 @@ osmt_trap_wait( IN osmtest_t * const    
                "Did not receive a Report(Notice) but attr:%d\n",
                cl_ntoh16(p_sa_mad->attr_id)
                );
+      status = IB_ERROR;
     }
   }
   else
@@ -675,6 +679,7 @@ osmt_trap_wait( IN osmtest_t * const    
              "Received an Unexpected Method:%d\n",
              p_smp->method
              );
+    status = IB_ERROR;
   }
 
  Exit: