|
|
@@ -1995,7 +1995,7 @@ int ipoib_add_pkey_attr(struct net_device *dev)
|
|
|
return device_create_file(&dev->dev, &dev_attr_pkey);
|
|
|
}
|
|
|
|
|
|
-int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
|
|
|
+void ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
|
|
|
{
|
|
|
priv->hca_caps = hca->attrs.device_cap_flags;
|
|
|
|
|
|
@@ -2007,8 +2007,6 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
|
|
|
|
|
|
priv->dev->features |= priv->dev->hw_features;
|
|
|
}
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
static struct net_device *ipoib_add_port(const char *format,
|
|
|
@@ -2048,9 +2046,7 @@ static struct net_device *ipoib_add_port(const char *format,
|
|
|
goto device_init_failed;
|
|
|
}
|
|
|
|
|
|
- result = ipoib_set_dev_features(priv, hca);
|
|
|
- if (result)
|
|
|
- goto device_init_failed;
|
|
|
+ ipoib_set_dev_features(priv, hca);
|
|
|
|
|
|
/*
|
|
|
* Set the full membership bit, so that we join the right
|