From patchwork Thu Feb 5 01:34:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 436544 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 3F4F61401F0 for ; Thu, 5 Feb 2015 12:36:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966848AbbBEBgK (ORCPT ); Wed, 4 Feb 2015 20:36:10 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:35625 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756278AbbBEBgA (ORCPT ); Wed, 4 Feb 2015 20:36:00 -0500 Received: by mail-ie0-f174.google.com with SMTP id vy18so6752957iec.5 for ; Wed, 04 Feb 2015 17:35:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tJRgQe2t0iOT/giNz4aW4tJKsPThF146jitDD3aWBwo=; b=HOqgXXOJCtzpm9TypiutLNsb+GPM+IPQPj6jB/rTv4agb855KnOJi9/Zb1Z0hvti71 bUSxAxLcd9VsNJrP7zy5CiJW86yudtN09W8KNw2vxUw0IoSO32SOhQfEAi86HNtUla9c LuBDFwSaA0oVKb9Da4/wum9HkjPOgHaH4f9/TX6GPjF/1ngDzJzkKevNLv5XP8FwKqzZ c1GDod7T34kE0zTanjrsBdEVk4+Y0n9f2q/QiTzAOCrUB9yQCHa14v1JuHtyW+FrRhZH L715DkR/jh73fokjpbrSIBT812RDf2pmAEF5VcxXu/OvSP2aR11PVi2UugwSJKODYp9O ivBA== X-Received: by 10.107.46.32 with SMTP id i32mr1460280ioo.21.1423100159733; Wed, 04 Feb 2015 17:35:59 -0800 (PST) Received: from localhost.localdomain ([174.51.80.140]) by mx.google.com with ESMTPSA id d1sm2001412igr.20.2015.02.04.17.35.59 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 17:35:59 -0800 (PST) From: David Ahern To: netdev@vger.kernel.org Cc: ebiederm@xmission.com, David Ahern Subject: [RFC PATCH 08/29] net: Flip fib_info to net_ctx Date: Wed, 4 Feb 2015 18:34:09 -0700 Message-Id: <1423100070-31848-9-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 1.9.3 (Apple Git-50) In-Reply-To: <1423100070-31848-1-git-send-email-dsahern@gmail.com> References: <1423100070-31848-1-git-send-email-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: David Ahern --- include/net/ip_fib.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 5bd120e4bc0a..dca7f30be57f 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -98,7 +98,8 @@ struct fib_nh { struct fib_info { struct hlist_node fib_hash; struct hlist_node fib_lhash; - struct net *fib_net; + struct net_ctx fib_net_ctx; +#define fib_net fib_net_ctx.net int fib_treeref; atomic_t fib_clntref; unsigned int fib_flags; @@ -122,6 +123,14 @@ struct fib_info { #define fib_dev fib_nh[0].nh_dev }; +static inline +int fib_net_ctx_eq(const struct fib_info *fi, const struct net_ctx *ctx) +{ + if (net_eq(fi->fib_net_ctx.net, ctx->net)) + return 1; + + return 0; +} #ifdef CONFIG_IP_MULTIPLE_TABLES struct fib_rule;