iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40iw: Do not free sqbuf when event is I40IW_TIMER_TYPE_CLOSE

Browse Source 
When the event type is I40IW_TIMER_TYPE_CLOSE, there is no sqbuf and
it should not be freed as one in i40iw_schedule_cm_timer().

Fixes: f27b4746f378 ("i40iw: add connection management code")
Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Mustafa Ismail 2017-11-21 16:18:31 -06:00 committed by Jason Gunthorpe
parent 100d6de2ce
commit 10499986db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/hw/i40iw/i40iw_cm.c
View File

@ -1043,7 +1043,7 @@ negotiate_done:
* i40iw_schedule_cm_timer * i40iw_schedule_cm_timer
* @@cm_node: connection's node * @@cm_node: connection's node
* @sqbuf: buffer to send * @sqbuf: buffer to send
* @type: if it es send ot close * @type: if it is send or close
* @send_retrans: if rexmits to be done * @send_retrans: if rexmits to be done
* @close_when_complete: is cm_node to be removed * @close_when_complete: is cm_node to be removed
* *
@ -1067,7 +1067,8 @@ int i40iw_schedule_cm_timer(struct i40iw_cm_node *cm_node,
new_send = kzalloc(sizeof(*new_send), GFP_ATOMIC); new_send = kzalloc(sizeof(*new_send), GFP_ATOMIC);
if (!new_send) { if (!new_send) {
i40iw_free_sqbuf(vsi, (void *)sqbuf); if (type != I40IW_TIMER_TYPE_CLOSE)
i40iw_free_sqbuf(vsi, (void *)sqbuf);
return -ENOMEM; return -ENOMEM;
} }
new_send->retrycount = I40IW_DEFAULT_RETRYS; new_send->retrycount = I40IW_DEFAULT_RETRYS;
@ -1082,7 +1083,6 @@ int i40iw_schedule_cm_timer(struct i40iw_cm_node *cm_node,
new_send->timetosend += (HZ / 10); new_send->timetosend += (HZ / 10);
if (cm_node->close_entry) { if (cm_node->close_entry) {
kfree(new_send); kfree(new_send);
i40iw_free_sqbuf(vsi, (void *)sqbuf);
i40iw_pr_err("already close entry\n"); i40iw_pr_err("already close entry\n");
return -EINVAL; return -EINVAL;
} }