IB/IPoIB: Support acceleration options callbacks

[karo-tx-linux.git] / drivers / infiniband / ulp / ipoib / ipoib_vlan.c

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 3e10e3dac2e7f51ba366c185e0d898db0b127857..36dc4fcaa3cdbcd2516d44fb9360c5dcccce1404 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -44,7 +44,7 @@ static ssize_t show_parent(struct device *d, struct device_attribute *attr,
                           char *buf)
 {
        struct net_device *dev = to_net_dev(d);
-       struct ipoib_dev_priv *priv = netdev_priv(dev);
+       struct ipoib_dev_priv *priv = ipoib_priv(dev);
 
        return sprintf(buf, "%s\n", priv->parent->name);
 }
@@ -86,8 +86,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
                goto register_failed;
        }
 
-       ipoib_create_debug_files(priv->dev);
-
        /* RTNL childs don't need proprietary sysfs entries */
        if (type == IPOIB_LEGACY_CHILD) {
                if (ipoib_cm_add_mode_attr(priv->dev))
@@ -108,7 +106,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
 
 sysfs_failed:
        result = -ENOMEM;
-       ipoib_delete_debug_files(priv->dev);
        unregister_netdevice(priv->dev);
 
 register_failed:
@@ -128,14 +125,15 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
 
-       ppriv = netdev_priv(pdev);
+       ppriv = ipoib_priv(pdev);
 
        if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags))
                return -EPERM;
 
        snprintf(intf_name, sizeof intf_name, "%s.%04x",
                 ppriv->dev->name, pkey);
-       priv = ipoib_intf_alloc(intf_name);
+
+       priv = ipoib_intf_alloc(ppriv->ca, ppriv->port, intf_name);
        if (!priv)
                return -ENOMEM;
 
@@ -183,7 +181,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
 
-       ppriv = netdev_priv(pdev);
+       ppriv = ipoib_priv(pdev);
 
        if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags))
                return -EPERM;