Commit 5add2f72 authored by David Wei's avatar David Wei Committed by David S. Miller
Browse files

netdevsim: fix backwards compatibility in nsim_get_iflink() 



The default ndo_get_iflink() implementation returns the current ifindex
of the netdev. But the overridden nsim_get_iflink() returns 0 if the
current nsim is not linked, breaking backwards compatibility for
userspace that depend on this behaviour.

Fix the problem by returning the current ifindex if not linked to a
peer.

Fixes: 8debcf58 ("netdevsim: add ndo_get_iflink() implementation")
Reported-by: default avatarYu Watanabe <watanabe.yu@gmail.com>
Suggested-by: default avatarYu Watanabe <watanabe.yu@gmail.com>
Signed-off-by: default avatarDavid Wei <dw@davidwei.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0579f272

drivers/net/netdevsim/netdev.c

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ static int nsim_get_iflink(const struct net_device *dev) 


	rcu_read_lock();

	peer = rcu_dereference(nsim->peer);

	iflink = peer ? READ_ONCE(peer->netdev->ifindex) : 0;

	iflink = peer ? READ_ONCE(peer->netdev->ifindex) :

			READ_ONCE(dev->ifindex);

	rcu_read_unlock();



	return iflink;