Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa7add8 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

infiniband/ipoib: implement ndo_get_iflink 



Don't use dev->iflink anymore.

CC: Roland Dreier <roland@kernel.org>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c411658

drivers/infiniband/ulp/ipoib/ipoib_main.c

+8 −0
Original line number Diff line number Diff line
@@ -842,6 +842,13 @@ static void ipoib_set_mcast_list(struct net_device *dev) 
	queue_work(ipoib_workqueue, &priv->restart_task);

}



static int ipoib_get_iflink(const struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);



	return priv->parent->ifindex;

}



static u32 ipoib_addr_hash(struct ipoib_neigh_hash *htbl, u8 *daddr)

{

	/*
@@ -1341,6 +1348,7 @@ static const struct net_device_ops ipoib_netdev_ops = { 
	.ndo_start_xmit	 	 = ipoib_start_xmit,

	.ndo_tx_timeout		 = ipoib_timeout,

	.ndo_set_rx_mode	 = ipoib_set_mcast_list,

	.ndo_get_iflink		 = ipoib_get_iflink,

};



void ipoib_setup(struct net_device *dev)

drivers/infiniband/ulp/ipoib/ipoib_vlan.c

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, 
	}



	priv->child_type  = type;

	priv->dev->iflink = ppriv->dev->ifindex;

	list_add_tail(&priv->list, &ppriv->child_intfs);



	return 0;