From edcddde1306446a66f3e74289ffd84ef40205550 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 11 Jan 2012 19:15:43 +0000 Subject: [PATCH] ib_srpt: Simplify the code for port_num range checking in srpt_event_handler() git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4061 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/src/ib_srpt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 831c8cdcc..bab9e9aca 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -299,14 +299,14 @@ static void srpt_event_handler(struct ib_event_handler *handler, switch (event->event) { case IB_EVENT_PORT_ERR: - port_num = event->element.port_num; - if (1 <= port_num && port_num <= sdev->device->phys_port_cnt) { - sport = &sdev->port[port_num - 1]; + port_num = event->element.port_num - 1; + if (port_num < sdev->device->phys_port_cnt) { + sport = &sdev->port[port_num]; sport->lid = 0; sport->sm_lid = 0; } else { WARN(true, "event %d: port_num %d out of range 1..%d\n", - event->event, port_num, + event->event, port_num + 1, sdev->device->phys_port_cnt); } break; @@ -316,14 +316,14 @@ static void srpt_event_handler(struct ib_event_handler *handler, case IB_EVENT_SM_CHANGE: case IB_EVENT_CLIENT_REREGISTER: /* Refresh port data asynchronously. */ - port_num = event->element.port_num; - if (1 <= port_num && port_num <= sdev->device->phys_port_cnt) { - sport = &sdev->port[port_num - 1]; + port_num = event->element.port_num - 1; + if (port_num < sdev->device->phys_port_cnt) { + sport = &sdev->port[port_num]; if (!sport->lid && !sport->sm_lid) schedule_work(&sport->work); } else { WARN(true, "event %d: port_num %d out of range 1..%d\n", - event->event, port_num, + event->event, port_num + 1, sdev->device->phys_port_cnt); } break;