diff mbox

opensm/osm_trap_rcv.c: Eliminate unneeded trap_rcv_process_response routine

Message ID 5087F033.6060604@dev.mellanox.co.il (mailing list archive)
State Rejected
Delegated to: Alex Netes
Headers show

Commit Message

Hal Rosenstock Oct. 24, 2012, 1:42 p.m. UTC
Trap represses (responses) never get to osm_trap_rcv_process.
They are handled in osm_sm_mad_ctrl.c:sm_mad_ctrl_rcv_callback
which invokes sm_mad_ctrl_process_trap_repress.

Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
 opensm/osm_trap_rcv.c |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

Comments

Alex Netes Oct. 25, 2012, 3:31 p.m. UTC | #1
Hi Hal,

On 09:42 Wed 24 Oct     , Hal Rosenstock wrote:
> 
> Trap represses (responses) never get to osm_trap_rcv_process.
> They are handled in osm_sm_mad_ctrl.c:sm_mad_ctrl_rcv_callback
> which invokes sm_mad_ctrl_process_trap_repress.
> 
> Signed-off-by: Hal Rosenstock <hal@mellanox.com>
> ---

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/opensm/osm_trap_rcv.c b/opensm/osm_trap_rcv.c
index c0a287f..6d2a3a6 100644
--- a/opensm/osm_trap_rcv.c
+++ b/opensm/osm_trap_rcv.c
@@ -632,18 +632,6 @@  Exit:
 	OSM_LOG_EXIT(sm->p_log);
 }
 
-static void trap_rcv_process_response(IN osm_sm_t * sm,
-				      IN const osm_madw_t * p_madw)
-{
-
-	OSM_LOG_ENTER(sm->p_log);
-
-	OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3808: "
-		"This function is not supported yet\n");
-
-	OSM_LOG_EXIT(sm->p_log);
-}
-
 void osm_trap_rcv_process(IN void *context, IN void *data)
 {
 	osm_sm_t *sm = context;
@@ -656,15 +644,9 @@  void osm_trap_rcv_process(IN void *context, IN void *data)
 
 	p_smp = osm_madw_get_smp_ptr(p_madw);
 
-	/*
-	   Determine if this is a request for our own Trap
-	   or if this is a response to our request for another
-	   SM's Trap.
-	 */
-	if (ib_smp_is_response(p_smp))
-		trap_rcv_process_response(sm, p_madw);
-	else
-		trap_rcv_process_request(sm, p_madw);
+	/* Only Trap requests get here */
+	CL_ASSERT(!ib_smp_is_response(p_smp));
+	trap_rcv_process_request(sm, p_madw);
 
 	OSM_LOG_EXIT(sm->p_log);
 }