diff --git a/[refs] b/[refs]
index a85ddf47e92f..35f65f95dde7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cd658cd2bca48d3a0e747b4525c72eb8855278e
+refs/heads/master: 85322947d761d08bd84165500f35b93c702aaaf3
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_sysfs.c b/trunk/drivers/infiniband/hw/ipath/ipath_sysfs.c
index 450c09ea5bc1..ccff629278a4 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -280,7 +280,7 @@ static ssize_t store_lid(struct device *dev,
 	if (ret < 0)
 		goto invalid;
 
-	if (lid == 0 || lid >= 0xc000) {
+	if (lid == 0 || lid >= IPS_MULTICAST_LID_BASE) {
 		ret = -EINVAL;
 		goto invalid;
 	}
@@ -314,7 +314,7 @@ static ssize_t store_mlid(struct device *dev,
 	int ret;
 
 	ret = ipath_parse_ushort(buf, &mlid);
-	if (ret < 0)
+	if (ret < 0 || mlid < IPS_MULTICAST_LID_BASE)
 		goto invalid;
 
 	unit = dd->ipath_unit;