From patchwork Mon Jul 6 15:25:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 491682 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D5A8D1402A9 for ; Tue, 7 Jul 2015 01:32:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905AbbGFPcy (ORCPT ); Mon, 6 Jul 2015 11:32:54 -0400 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:32976 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753105AbbGFPcw (ORCPT ); Mon, 6 Jul 2015 11:32:52 -0400 X-Greylist: delayed 440 seconds by postgrey-1.27 at vger.kernel.org; Mon, 06 Jul 2015 11:32:52 EDT Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 7E191281D5; Mon, 6 Jul 2015 17:25:29 +0200 (CEST) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1ZC8Gp-000168-Ao; Mon, 06 Jul 2015 17:25:23 +0200 From: Nicolas Dichtel To: socketcan@hartkopp.net Cc: ulrich.gemkow@ikr.uni-stuttgart.de, davem@davemloft.net, netdev@vger.kernel.org, shemminger@vyatta.com, Nicolas Dichtel Subject: [PATCH net] Revert "dev: set iflink to 0 for virtual interfaces" Date: Mon, 6 Jul 2015 17:25:10 +0200 Message-Id: <1436196310-4090-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <5589959A.8060600@hartkopp.net> References: <5589959A.8060600@hartkopp.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Nicolas Dichtel Tested-by: Oliver Hartkopp --- 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);