summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-07-06 17:25:10 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-08 15:52:33 -0700
commit95ec655bc465ccb2a3329d4aff9a45e3c8188db5 (patch)
tree8dd6a41d97d573260cb601c311bc7e3af943ec99 /net
parentd339727c2b1a10f25e6636670ab6e1841170e328 (diff)
downloadlinux-95ec655bc465ccb2a3329d4aff9a45e3c8188db5.tar.bz2
Revert "dev: set iflink to 0 for virtual interfaces"
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0ad626214332..1e57efda055b 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);