1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index e299148c4b..182de34f9f 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -257,7 +257,7 @@ static ssize_t store_guid(struct device *dev,
         struct ipath_devdata *dd = dev_get_drvdata(dev);
         ssize_t ret;
         unsigned short guid[8];
-        __be64 nguid;
+        __be64 new_guid;
         u8 *ng;
         int i;
 
@@ -266,7 +266,7 @@ static ssize_t store_guid(struct device *dev,
                    &guid[4], &guid[5], &guid[6], &guid[7]) != 8)
                 goto invalid;
 
-        ng = (u8 *) &nguid;
+        ng = (u8 *) &new_guid;
 
         for (i = 0; i < 8; i++) {
                 if (guid[i] > 0xff)
@@ -274,7 +274,10 @@ static ssize_t store_guid(struct device *dev,
                 ng[i] = guid[i];
         }
 
-        dd->ipath_guid = nguid;
+        if (new_guid == 0)
+                goto invalid;
+
+        dd->ipath_guid = new_guid;
         dd->ipath_nguid = 1;
 
         ret = strlen(buf);
@@ -297,6 +300,16 @@ static ssize_t show_nguid(struct device *dev,
         return scnprintf(buf, PAGE_SIZE, "%u\n", dd->ipath_nguid);
 }
 
+static ssize_t show_nports(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        struct ipath_devdata *dd = dev_get_drvdata(dev);
+
+        /* Return the number of user ports available. */
+        return scnprintf(buf, PAGE_SIZE, "%u\n", dd->ipath_cfgports - 1);
+}
+
 static ssize_t show_serial(struct device *dev,
                            struct device_attribute *attr,
                            char *buf)
@@ -608,6 +621,7 @@ static DEVICE_ATTR(mlid, S_IWUSR | S_IRUGO, show_mlid, store_mlid);
 static DEVICE_ATTR(mtu, S_IWUSR | S_IRUGO, show_mtu, store_mtu);
 static DEVICE_ATTR(enabled, S_IWUSR | S_IRUGO, show_enabled, store_enabled);
 static DEVICE_ATTR(nguid, S_IRUGO, show_nguid, NULL);
+static DEVICE_ATTR(nports, S_IRUGO, show_nports, NULL);
 static DEVICE_ATTR(reset, S_IWUSR, NULL, store_reset);
 static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
 static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
@@ -623,6 +637,7 @@ static struct attribute *dev_attributes[] = {
         &dev_attr_mlid.attr,
         &dev_attr_mtu.attr,
         &dev_attr_nguid.attr,
+        &dev_attr_nports.attr,
         &dev_attr_serial.attr,
         &dev_attr_status.attr,
         &dev_attr_status_str.attr,