From 32483da5b43cdc4060a332e6e2f5600d628582c5 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Sat, 19 May 2007 08:51:54 -0700 Subject: [PATCH] --- yaml --- r: 56734 b: refs/heads/master c: 1af4c435f3ab9cdf72ce86c35a455c8bef1d6536 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/device.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 55587e96f097..2b2ab2ff748f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eb620c81ce35aa0c533131bf4d06c4c8c2bfadf +refs/heads/master: 1af4c435f3ab9cdf72ce86c35a455c8bef1d6536 diff --git a/trunk/drivers/infiniband/core/device.c b/trunk/drivers/infiniband/core/device.c index b448e0b2b6b4..b58319642014 100644 --- a/trunk/drivers/infiniband/core/device.c +++ b/trunk/drivers/infiniband/core/device.c @@ -569,10 +569,7 @@ int ib_query_port(struct ib_device *device, u8 port_num, struct ib_port_attr *port_attr) { - if (device->node_type == RDMA_NODE_IB_SWITCH) { - if (port_num) - return -EINVAL; - } else if (port_num < 1 || port_num > device->phys_port_cnt) + if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; return device->query_port(device, port_num, port_attr); @@ -644,10 +641,7 @@ int ib_modify_port(struct ib_device *device, u8 port_num, int port_modify_mask, struct ib_port_modify *port_modify) { - if (device->node_type == RDMA_NODE_IB_SWITCH) { - if (port_num) - return -EINVAL; - } else if (port_num < 1 || port_num > device->phys_port_cnt) + if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; return device->modify_port(device, port_num, port_modify_mask,