.. | .. |
---|
310 | 310 | if (status) { |
---|
311 | 311 | pr_debug("(port: %d) failed: status = %d\n", |
---|
312 | 312 | cb_ctx->port, status); |
---|
313 | | - rec->time_to_run = ktime_get_boot_ns() + 1 * NSEC_PER_SEC; |
---|
| 313 | + rec->time_to_run = ktime_get_boottime_ns() + 1 * NSEC_PER_SEC; |
---|
314 | 314 | goto out; |
---|
315 | 315 | } |
---|
316 | 316 | |
---|
.. | .. |
---|
416 | 416 | be64_to_cpu((__force __be64)rec->guid_indexes), |
---|
417 | 417 | be64_to_cpu((__force __be64)applied_guid_indexes), |
---|
418 | 418 | be64_to_cpu((__force __be64)declined_guid_indexes)); |
---|
419 | | - rec->time_to_run = ktime_get_boot_ns() + |
---|
| 419 | + rec->time_to_run = ktime_get_boottime_ns() + |
---|
420 | 420 | resched_delay_sec * NSEC_PER_SEC; |
---|
421 | 421 | } else { |
---|
422 | 422 | rec->status = MLX4_GUID_INFO_STATUS_SET; |
---|
.. | .. |
---|
709 | 709 | } |
---|
710 | 710 | } |
---|
711 | 711 | if (resched_delay_sec) { |
---|
712 | | - u64 curr_time = ktime_get_boot_ns(); |
---|
| 712 | + u64 curr_time = ktime_get_boottime_ns(); |
---|
713 | 713 | |
---|
714 | 714 | *resched_delay_sec = (low_record_time < curr_time) ? 0 : |
---|
715 | 715 | div_u64((low_record_time - curr_time), NSEC_PER_SEC); |
---|
.. | .. |
---|
849 | 849 | spin_lock_init(&dev->sriov.alias_guid.ag_work_lock); |
---|
850 | 850 | |
---|
851 | 851 | for (i = 1; i <= dev->num_ports; ++i) { |
---|
852 | | - if (dev->ib_dev.query_gid(&dev->ib_dev , i, 0, &gid)) { |
---|
| 852 | + if (dev->ib_dev.ops.query_gid(&dev->ib_dev, i, 0, &gid)) { |
---|
853 | 853 | ret = -EFAULT; |
---|
854 | 854 | goto err_unregister; |
---|
855 | 855 | } |
---|