summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-08-24 15:58:26 -0400
committerDoug Ledford <dledford@redhat.com>2017-08-24 15:58:26 -0400
commit732912c7386120179bf8f666febc232922e3ee17 (patch)
treee28dea126ed19c39c3a4eccff36687d5028bda9e /include/rdma
parente3bf14bdc17a8e917f337760cc7cacf3232d7dbc (diff)
parentec2558796d25e6024071b6bcb8e11392538d57bf (diff)
downloadlinux-732912c7386120179bf8f666febc232922e3ee17.tar.gz
linux-732912c7386120179bf8f666febc232922e3ee17.tar.bz2
linux-732912c7386120179bf8f666febc232922e3ee17.zip
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Pick up -rc fixes. Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/ib_verbs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 8f263930c56f..c155c105589d 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1696,6 +1696,7 @@ struct ib_qp {
enum ib_qp_type qp_type;
struct ib_rwq_ind_table *rwq_ind_tbl;
struct ib_qp_security *qp_sec;
+ u8 port;
};
struct ib_mr {