Re: [PATCH net] Revert "dev: set iflink to 0 for virtual interfaces"

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 06.07.2015 17:25, Nicolas Dichtel wrote:
> This reverts commit e1622baf54df8cc958bf29d71de5ad545ea7d93c.
>
> 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: Olivier Hartkopp <socketcan@hartkopp.net>
                   ^^^
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>

Thanks Nicolas!

BR
Oliver

> ---
>   net/core/dev.c | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 6778a9999d52..72e0a4331154 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -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);
>