From patchwork Tue Aug 30 17:34:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 664215 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 3sNwdG74vKz9s9W for ; Wed, 31 Aug 2016 03:34:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=hoqeRrKD; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932989AbcH3Rej (ORCPT ); Tue, 30 Aug 2016 13:34:39 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34256 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932964AbcH3Ree (ORCPT ); Tue, 30 Aug 2016 13:34:34 -0400 Received: by mail-pa0-f52.google.com with SMTP id fi15so9511419pac.1 for ; Tue, 30 Aug 2016 10:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qm7S4wbSqKvxa0ldX0w+wNUMq/9XHyA5ZNjix0R+9Ps=; b=hoqeRrKDf9Wz5kSO7gYIe4vB49vI1Lp2Ga9OZrxenKsg1Vjd9TP/XKMryTf89+eOlN SADZyV7dHwCPKXgfivk000vtZ5luM5uahyzMd1qteBdwGtQ7dvzGTEVGDTtLKdXNf8bA p+9xMMt7Pr5HXmbeMyUiLNmtRpxc0z1ZUFVJU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qm7S4wbSqKvxa0ldX0w+wNUMq/9XHyA5ZNjix0R+9Ps=; b=krXf8eyPh5JUzX0WALGjQuQPl4hmX+WRiv+BljTOsbSg3pbKKYSpZ6KdJlBhdLgcA1 dRNIzPty36ZnmHqANCuKgLYEyalnVoB/u2rGf0XYSqNNO/sDYNjbo/y2cFl31lkWlm7k t4iaWJKneS3Ex6RsSO/LgHvWqOWyWelEw5rQCj3Kb1F2HQuIlvIN1JsdwEG+J6m8O6ms m8bMgV0OHs7pAxlUbuJ58P0M7NwtYIT7aRnihdR90/ttwC+8DvO8p9/YXyc3IobLHZ83 fTi3ThBRnPKeJ2e6lXgqtbMFf4PlmCT6Us1YTlbgRErGjvxPOURdL9UgtZxfLX90Aqw/ 0d8w== X-Gm-Message-State: AE9vXwNFEqh0dHi+VSo2amrnvcOz1re2B+KMojFOglpgVns7x85yIdq5pAGA0+SKn/m3lJpJ X-Received: by 10.66.148.7 with SMTP id to7mr8428462pab.128.1472578473057; Tue, 30 Aug 2016 10:34:33 -0700 (PDT) Received: from kenny.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id yu7sm37793458pab.45.2016.08.30.10.34.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Aug 2016 10:34:32 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: David Ahern Subject: [PATCH net-next 11/12] net: l3mdev: Remove l3mdev_fib_oif Date: Tue, 30 Aug 2016 10:34:16 -0700 Message-Id: <1472578457-26722-12-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1472578457-26722-1-git-send-email-dsa@cumulusnetworks.com> References: <1472578457-26722-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No longer used Signed-off-by: David Ahern --- include/net/l3mdev.h | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/include/net/l3mdev.h b/include/net/l3mdev.h index 3c1d71474f55..6aae664b427a 100644 --- a/include/net/l3mdev.h +++ b/include/net/l3mdev.h @@ -95,26 +95,6 @@ struct net_device *l3mdev_master_dev_rcu(const struct net_device *_dev) return master; } -/* get index of an interface to use for FIB lookups. For devices - * enslaved to an L3 master device FIB lookups are based on the - * master index - */ -static inline int l3mdev_fib_oif_rcu(struct net_device *dev) -{ - return l3mdev_master_ifindex_rcu(dev) ? : dev->ifindex; -} - -static inline int l3mdev_fib_oif(struct net_device *dev) -{ - int oif; - - rcu_read_lock(); - oif = l3mdev_fib_oif_rcu(dev); - rcu_read_unlock(); - - return oif; -} - u32 l3mdev_fib_table_rcu(const struct net_device *dev); u32 l3mdev_fib_table_by_index(struct net *net, int ifindex); static inline u32 l3mdev_fib_table(const struct net_device *dev) @@ -224,15 +204,6 @@ struct net_device *l3mdev_master_dev_rcu(const struct net_device *dev) return NULL; } -static inline int l3mdev_fib_oif_rcu(struct net_device *dev) -{ - return dev ? dev->ifindex : 0; -} -static inline int l3mdev_fib_oif(struct net_device *dev) -{ - return dev ? dev->ifindex : 0; -} - static inline u32 l3mdev_fib_table_rcu(const struct net_device *dev) { return 0;