| Message ID | 20170719185526.5404-1-shiraz.saleem@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 2017-07-19 at 13:55 -0500, Shiraz Saleem wrote: > Remove NULL check for cm_node->listener in i40iw_accept > as listener is always present at this point. > > Remove the check for cm_node->accept_pend and related code > in i40iw_cm_event_connected as the cm_node in this context > is only pertinent to active node and cm_node->accept_pend > is always 0. > > This fixes the following smatch warnings, > > drivers/infiniband/hw/i40iw/i40iw_cm.c:3691 i40iw_accept() > error: we previously assumed 'cm_node->listener' could be null > > drivers/infiniband/hw/i40iw/i40iw_cm.c:4061 > i40iw_cm_event_connected() > error: we previously assumed 'cm_node->listener' could be null > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> Thanks, applied.
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c index 6ae98aa..8f44636 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@ -3686,8 +3686,6 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) cm_node->accelerated = 1; if (cm_node->accept_pend) { - if (!cm_node->listener) - i40iw_pr_err("cm_node->listener NULL for passive node\n"); atomic_dec(&cm_node->listener->pend_accepts_cnt); cm_node->accept_pend = 0; } @@ -4055,12 +4053,7 @@ static void i40iw_cm_event_connected(struct i40iw_cm_event *event) i40iw_modify_qp(&iwqp->ibqp, &attr, IB_QP_STATE, NULL); cm_node->accelerated = 1; - if (cm_node->accept_pend) { - if (!cm_node->listener) - i40iw_pr_err("listener is null for passive node\n"); - atomic_dec(&cm_node->listener->pend_accepts_cnt); - cm_node->accept_pend = 0; - } + return; error:
Remove NULL check for cm_node->listener in i40iw_accept as listener is always present at this point. Remove the check for cm_node->accept_pend and related code in i40iw_cm_event_connected as the cm_node in this context is only pertinent to active node and cm_node->accept_pend is always 0. This fixes the following smatch warnings, drivers/infiniband/hw/i40iw/i40iw_cm.c:3691 i40iw_accept() error: we previously assumed 'cm_node->listener' could be null drivers/infiniband/hw/i40iw/i40iw_cm.c:4061 i40iw_cm_event_connected() error: we previously assumed 'cm_node->listener' could be null Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> --- drivers/infiniband/hw/i40iw/i40iw_cm.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)