diff mbox

[stable] Revert "dev: set iflink to 0 for virtual interfaces"

Message ID 20150825140958.0271ad4e@urahara
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Hemminger Aug. 25, 2015, 9:09 p.m. UTC 
Dave could you include this in next update to 4.1 stable update?

From a72f813bf1aab4dfe47e3d4ab5e2e07bbcdf2b58 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Mon, 6 Jul 2015 17:25:10 +0200
Subject: [PATCH] Revert "dev: set iflink to 0 for virtual interfaces"

commit 95ec655bc465ccb2a3329d4aff9a45e3c8188db5 upstream.
It should be applied to 4.1.y stable tree.

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>
---
 net/core/dev.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

David Miller Aug. 25, 2015, 9:28 p.m. UTC | #1 
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 25 Aug 2015 14:09:58 -0700

> Dave could you include this in next update to 4.1 stable update?

Queued up, thanks Stephen.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index aa82f9a..8c416c99 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);