diff options
| author | Arthur Jones <arthur.jones@qlogic.com> | 2008-04-16 21:09:31 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-04-16 21:09:31 -0700 |
| commit | bb9171448deb1f7ece27674e2e431e4f267fd453 (patch) | |
| tree | b042155205bbbe3deb317d65a53a4180fb512435 /drivers/infiniband/hw/ipath/ipath_sysfs.c | |
| parent | 8babfa4fb9bfe93d57c700410a4f8be9fbd3edd7 (diff) | |
| download | linux-bb9171448deb1f7ece27674e2e431e4f267fd453.tar.gz linux-bb9171448deb1f7ece27674e2e431e4f267fd453.tar.bz2 linux-bb9171448deb1f7ece27674e2e431e4f267fd453.zip | |
IB/ipath: Misc changes to prepare for IB7220 introduction
The patch adds a number of minor changes to support newer HCAs:
- New send buffer control bits
- New error condition bits
- Locking and initialization changes
- More send buffers
Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_sysfs.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_sysfs.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c index 7961d26404f1..2e6d2aab2600 100644 --- a/drivers/infiniband/hw/ipath/ipath_sysfs.c +++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c @@ -34,6 +34,7 @@ #include <linux/ctype.h> #include "ipath_kernel.h" +#include "ipath_verbs.h" #include "ipath_common.h" /** @@ -320,6 +321,8 @@ static ssize_t store_guid(struct device *dev, dd->ipath_guid = new_guid; dd->ipath_nguid = 1; + if (dd->verbs_dev) + dd->verbs_dev->ibdev.node_guid = new_guid; ret = strlen(buf); goto bail; @@ -928,18 +931,17 @@ static ssize_t store_rx_polinv_enb(struct device *dev, u16 val; ret = ipath_parse_ushort(buf, &val); - if (ret < 0 || val > 1) - goto invalid; + if (ret >= 0 && val > 1) { + ipath_dev_err(dd, + "attempt to set invalid Rx Polarity (enable)\n"); + ret = -EINVAL; + goto bail; + } r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_RXPOL_ENB, val); - if (r < 0) { + if (r < 0) ret = r; - goto bail; - } - goto bail; -invalid: - ipath_dev_err(dd, "attempt to set invalid Rx Polarity (enable)\n"); bail: return ret; } |