[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1436196310-4090-1-git-send-email-nicolas.dichtel@6wind.com>
Date: Mon, 6 Jul 2015 17:25:10 +0200
From: Nicolas Dichtel <nicolas.dichtel@...nd.com>
To: socketcan@...tkopp.net
Cc: ulrich.gemkow@....uni-stuttgart.de, davem@...emloft.net,
netdev@...r.kernel.org, shemminger@...tta.com,
Nicolas Dichtel <nicolas.dichtel@...nd.com>
Subject: [PATCH net] Revert "dev: set iflink to 0 for virtual interfaces"
This reverts commit e1622baf54df8cc958bf29d71de5ad545ea7d93c.
The side effect of this commit is to add a '@...E' after each virtual
interface name with a 'ip link'. It may break existing scripts.
Reported-by: Olivier Hartkopp <socketcan@...tkopp.net>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@...nd.com>
---
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);
--
2.4.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists