| From foo@baz Sat Sep 26 11:13:07 PDT 2015 |
| From: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| Date: Mon, 6 Jul 2015 17:25:10 +0200 |
| Subject: Revert "dev: set iflink to 0 for virtual interfaces" |
| |
| From: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| |
| [ Upstream commit 95ec655bc465ccb2a3329d4aff9a45e3c8188db5 ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/core/dev.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -672,10 +672,6 @@ int dev_get_iflink(const struct net_devi |
| 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); |
