diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-07-06 17:25:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 19:26:20 +0200 |
| commit | c559b9ff0bcbfce18608d1e89cdc2358e234f803 (patch) | |
| tree | 21dd8acea8146fbe792754a02c97b9de002674f7 /net | |
| parent | bd60ae48f727ef6cb9b0524fb49b7336cbb0ca66 (diff) | |
Revert "dev: set iflink to 0 for virtual interfaces"
[ 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 47239143b48e..877ec57f6d7e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -672,10 +672,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); |