xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next

Browse Source
This commit is contained in:
Roland Dreier
2014-08-14 08:58:04 -07:00
parent 9376932d0c 678ea9b5ba e42fa2092c 8d4aca7f04 2f0304d218 1471cb6ca6 db1044d458 a57f23f675 a8f731ebd1 96c51abecc da05be290f
commit d087f6ad72
48 changed files with 1432 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@@ -198,6 +198,7 @@ static void srpt_event_handler(struct ib_event_handler *handler,
case IB_EVENT_PKEY_CHANGE:
case IB_EVENT_SM_CHANGE:
case IB_EVENT_CLIENT_REREGISTER:
case IB_EVENT_GID_CHANGE:
/* Refresh port data asynchronously. */
if (event->element.port_num <= sdev->device->phys_port_cnt) {
sport = &sdev->port[event->element.port_num - 1];
@@ -563,7 +564,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
&reg_req, 0,
srpt_mad_send_handler,
srpt_mad_recv_handler,
sport);
sport, 0);
if (IS_ERR(sport->mad_agent)) {
ret = PTR_ERR(sport->mad_agent);
sport->mad_agent = NULL;