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

Commit 95ec655b authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

Revert "dev: set iflink to 0 for virtual interfaces" 



This reverts commit e1622baf.

The side effect of this commit is to add a '@NONE' after each virtual
interface name with a 'ip link'. It may break existing scripts.

Reported-by: default avatarOlivier Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d339727c

net/core/dev.c

+0 −4
Original line number Diff line number Diff line
@@ -677,10 +677,6 @@ int dev_get_iflink(const struct net_device *dev) 
	if (dev->netdev_ops && dev->netdev_ops->ndo_get_iflink)

		return dev->netdev_ops->ndo_get_iflink(dev);



	/* If dev->rtnl_link_ops is set, it's a virtual interface. */

	if (dev->rtnl_link_ops)

		return 0;



	return dev->ifindex;

}

EXPORT_SYMBOL(dev_get_iflink);