From be2191c8389ffdf05a1eec9b11b0ef68e899b460 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Mon, 18 Oct 2010 14:45:20 -0700 Subject: [PATCH] --- yaml --- r: 217735 b: refs/heads/master c: 2420b60b1dc4ed98cb1788e928bc57ff2efa1a8d h: refs/heads/master i: 217733: 83cd29987d0cb15e9e09e63cde2966548580d0b4 217731: 4e40e6e4416da68184e59af9b599be03c6652260 217727: 22b7726afc8bf2b29ef1794012e51be1cbdf25fc v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/uverbs_cmd.c | 2 ++ trunk/include/rdma/ib_user_verbs.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a97c68123a96..2def29dfc79e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff7f5aab354dee01f29c9c00933f6d4aa590eadb +refs/heads/master: 2420b60b1dc4ed98cb1788e928bc57ff2efa1a8d diff --git a/trunk/drivers/infiniband/core/uverbs_cmd.c b/trunk/drivers/infiniband/core/uverbs_cmd.c index 6fcfbeb24a23..b342248aec05 100644 --- a/trunk/drivers/infiniband/core/uverbs_cmd.c +++ b/trunk/drivers/infiniband/core/uverbs_cmd.c @@ -460,6 +460,8 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file, resp.active_width = attr.active_width; resp.active_speed = attr.active_speed; resp.phys_state = attr.phys_state; + resp.link_layer = rdma_port_get_link_layer(file->device->ib_dev, + cmd.port_num); if (copy_to_user((void __user *) (unsigned long) cmd.response, &resp, sizeof resp)) diff --git a/trunk/include/rdma/ib_user_verbs.h b/trunk/include/rdma/ib_user_verbs.h index a17f77106149..fe5b05177a2c 100644 --- a/trunk/include/rdma/ib_user_verbs.h +++ b/trunk/include/rdma/ib_user_verbs.h @@ -205,7 +205,8 @@ struct ib_uverbs_query_port_resp { __u8 active_width; __u8 active_speed; __u8 phys_state; - __u8 reserved[3]; + __u8 link_layer; + __u8 reserved[2]; }; struct ib_uverbs_alloc_pd {