Commit 87fb5c1c authored by Michael Guralnik's avatar Michael Guralnik Committed by Jason Gunthorpe
Browse files

RDMA/ipoib: Handle user-supplied address when creating child 

Use the address supplied by user when creating a child interface.

Previously, the address requested by the user was ignored and overridden
with parent's GID and the random QP number assigned to the child.

Link: https://lore.kernel.org/r/20200623110105.1225750-3-leon@kernel.org


Signed-off-by: default avatarMichael Guralnik <michaelgur@mellanox.com>
Reviewed-by: default avatarFeras Daoud <ferasda@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 4dca6509

drivers/infiniband/ulp/ipoib/ipoib_main.c

+9 −2
Original line number Diff line number Diff line
@@ -1892,8 +1892,15 @@ static void ipoib_child_init(struct net_device *ndev) 


	priv->max_ib_mtu = ppriv->max_ib_mtu;

	set_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags);

	memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr, INFINIBAND_ALEN);

	memcpy(&priv->local_gid, &ppriv->local_gid, sizeof(priv->local_gid));

	if (memchr_inv(priv->dev->dev_addr, 0, INFINIBAND_ALEN))

		memcpy(&priv->local_gid, priv->dev->dev_addr + 4,

		       sizeof(priv->local_gid));

	else {

		memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr,

		       INFINIBAND_ALEN);

		memcpy(&priv->local_gid, &ppriv->local_gid,

		       sizeof(priv->local_gid));

	}

}



static int ipoib_ndo_init(struct net_device *ndev)