2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 657b89b1d291..915ad04a827e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -846,6 +846,11 @@ static int ipoib_get_iflink(const struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        /* parent interface */
+        if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))
+                return dev->ifindex;
+
+        /* child/vlan interface */
         return priv->parent->ifindex;
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 4dd1313056a4..fca1a882de27 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -58,6 +58,7 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
         /* MTU will be reset when mcast join happens */
         priv->dev->mtu   = IPOIB_UD_MTU(priv->max_ib_mtu);
         priv->mcast_mtu  = priv->admin_mtu = priv->dev->mtu;
+        priv->parent = ppriv->dev;
         set_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags);
 
         result = ipoib_set_dev_features(priv, ppriv->ca);
@@ -84,8 +85,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
                 goto register_failed;
         }
 
-        priv->parent = ppriv->dev;
-
         ipoib_create_debug_files(priv->dev);
 
         /* RTNL childs don't need proprietary sysfs entries */