diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-07-24 15:33:43 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-07-24 15:33:43 +0300 |
| commit | 03da084ed8804ddc5918883be84245b53393b8fb (patch) | |
| tree | 564a4860cb9c5de3f504fd6156110d95b1c9f26b /drivers/infiniband/hw/qib/qib_verbs.h | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| parent | bc5214ee29220251e5507882696ded5ca183b169 (diff) | |
| download | linux-03da084ed8804ddc5918883be84245b53393b8fb.tar.xz | |
Merge branch 'hfi1' into k.o/for-4.14
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_verbs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h index a52fc67b40d7..95e370192948 100644 --- a/drivers/infiniband/hw/qib/qib_verbs.h +++ b/drivers/infiniband/hw/qib/qib_verbs.h @@ -241,8 +241,8 @@ static inline int qib_pkey_ok(u16 pkey1, u16 pkey2) return p1 && p1 == p2 && ((__s16)pkey1 < 0 || (__s16)pkey2 < 0); } -void qib_bad_pqkey(struct qib_ibport *ibp, __be16 trap_num, u32 key, u32 sl, - u32 qp1, u32 qp2, __be16 lid1, __be16 lid2); +void qib_bad_pkey(struct qib_ibport *ibp, u32 key, u32 sl, + u32 qp1, u32 qp2, __be16 lid1, __be16 lid2); void qib_cap_mask_chg(struct rvt_dev_info *rdi, u8 port_num); void qib_sys_guid_chg(struct qib_ibport *ibp); void qib_node_desc_chg(struct qib_ibport *ibp); |