Skip to contentSkip to conversation

Patch "Revert "dev: set iflink to 0 for virtual interfaces"" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 26, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Revert "dev: set iflink to 0 for virtual interfaces"

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
revert-dev-set-iflink-to-0-for-virtual-interfaces.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Sep 26 11:13:07 PDT 2015

From: Nicolas Dichtel <[email protected]>
Date: Mon, 6 Jul 2015 17:25:10 +0200
Subject: Revert "dev: set iflink to 0 for virtual interfaces"

From: Nicolas Dichtel <[email protected]>

[ 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.

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

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/revert-dev-set-iflink-to-0-for-virtual-interfaces.patch queue-4.1/rtnetlink-verify-ifla_vf_info-attributes-before-passing-them-to-driver.patch