lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 07 Apr 2015 14:36:00 +0200 From: Michael Wang <yun.wang@...fitbricks.com> To: Roland Dreier <roland@...nel.org>, Sean Hefty <sean.hefty@...el.com>, linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org, linux-nfs@...r.kernel.org, netdev@...r.kernel.org CC: Hal Rosenstock <hal.rosenstock@...il.com>, Tom Tucker <tom@...ngridcomputing.com>, Steve Wise <swise@...ngridcomputing.com>, Hoang-Nam Nguyen <hnguyen@...ibm.com>, Christoph Raisch <raisch@...ibm.com>, Mike Marciniszyn <infinipath@...el.com>, Eli Cohen <eli@...lanox.com>, Faisal Latif <faisal.latif@...el.com>, Upinder Malhi <umalhi@...co.com>, Trond Myklebust <trond.myklebust@...marydata.com>, "J. Bruce Fields" <bfields@...ldses.org>, "David S. Miller" <davem@...emloft.net>, Ira Weiny <ira.weiny@...el.com>, PJ Waskiewicz <pj.waskiewicz@...idfire.com>, Tatyana Nikolova <Tatyana.E.Nikolova@...el.com>, Or Gerlitz <ogerlitz@...lanox.com>, Jack Morgenstein <jackm@....mellanox.co.il>, Haggai Eran <haggaie@...lanox.com>, Ilya Nelkenbaum <ilyan@...lanox.com>, Yann Droneaud <ydroneaud@...eya.com>, Bart Van Assche <bvanassche@....org>, Shachar Raindel <raindel@...lanox.com>, Sagi Grimberg <sagig@...lanox.com>, Devesh Sharma <devesh.sharma@...lex.com>, Matan Barak <matanb@...lanox.com>, Moni Shoua <monis@...lanox.com>, Jiri Kosina <jkosina@...e.cz>, Selvin Xavier <selvin.xavier@...lex.com>, Mitesh Ahuja <mitesh.ahuja@...lex.com>, Li RongQing <roy.qing.li@...il.com>, Rasmus Villemoes <linux@...musvillemoes.dk>, Alex Estrin <alex.estrin@...el.com>, Doug Ledford <dledford@...hat.com>, Eric Dumazet <edumazet@...gle.com>, Erez Shitrit <erezsh@...lanox.com>, Tom Gundersen <teg@...m.no>, Chuck Lever <chuck.lever@...cle.com>, Michael Wang <yun.wang@...fitbricks.com> Subject: [PATCH v2 11/17] IB/Verbs: Reform link_layer_show() and ib_uverbs_query_port() Reform link_layer_show() and ib_uverbs_query_port() with management helpers. Cc: Jason Gunthorpe <jgunthorpe@...idianresearch.com> Cc: Doug Ledford <dledford@...hat.com> Cc: Ira Weiny <ira.weiny@...el.com> Cc: Sean Hefty <sean.hefty@...el.com> Signed-off-by: Michael Wang <yun.wang@...fitbricks.com> --- drivers/infiniband/core/sysfs.c | 8 ++------ drivers/infiniband/core/uverbs_cmd.c | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index cbd0383..aa53e40 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -248,14 +248,10 @@ static ssize_t phys_state_show(struct ib_port *p, struct port_attribute *unused, static ssize_t link_layer_show(struct ib_port *p, struct port_attribute *unused, char *buf) { - switch (rdma_port_get_link_layer(p->ibdev, p->port_num)) { - case IB_LINK_LAYER_INFINIBAND: + if (rdma_transport_ib(p->ibdev, p->port_num)) return sprintf(buf, "%s\n", "InfiniBand"); - case IB_LINK_LAYER_ETHERNET: + else return sprintf(buf, "%s\n", "Ethernet"); - default: - return sprintf(buf, "%s\n", "Unknown"); - } } static PORT_ATTR_RO(state); diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index a9f0489..3eb6eb5 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -515,8 +515,10 @@ 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); + resp.link_layer = rdma_transport_ib(file->device->ib_dev, + cmd.port_num) ? + IB_LINK_LAYER_INFINIBAND : + IB_LINK_LAYER_ETHERNET; if (copy_to_user((void __user *) (unsigned long) cmd.response, &resp, sizeof resp)) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists