From patchwork Mon Sep 11 21:11:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S981hRJh"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrgh92Nm7z9s0Z for ; Tue, 12 Sep 2017 07:15:53 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 31E1CCCA; Mon, 11 Sep 2017 21:11:28 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D6BA8CC5 for ; Mon, 11 Sep 2017 21:11:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A69C0A4 for ; Mon, 11 Sep 2017 21:11:25 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id i23so601056pfi.2 for ; Mon, 11 Sep 2017 14:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IKrdHeopdQgCSK5k/p82LIktc2ZAU+0pOt30MD1XmKM=; b=S981hRJhQWhw+C5DHblR22h7BpDxXCHTd9Dc+GL7LIcZhxtvkziffFB28B7t+tLjGR WEJtbF+mEwIxkY2dwlopA5ZtA7MY986SzE6iDT83TeSplWyD4e5SWCzlldUahzc++Fat AydbnQiHTrgw2IxcNs+SSFE3riZk9Ap1QAlwhxiNmYmHDh0fLLrjJc3Qkls1jENymFd4 6KhxoXhaSkf0cYrXjOy9SCrFM/OByVvONFIEP5v3UWWIe+AImavkQTsKgkPadeYJZ52z xTq3IxfdDwxO9qwBgXOX4QdiFv8tI0jXylzFNEVweHhr+RWtKYgxTRq44pdaCAzVY29h JM3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IKrdHeopdQgCSK5k/p82LIktc2ZAU+0pOt30MD1XmKM=; b=PcuaRKCU92rVOoZsrwf7Wsexy9EMBp+CfPsxcrEGHvwo2nQUIREZWehV/IxOF9uFyz M9cY9lYFC9363s2TMPXV9rWLL/NexbhoshnihOngiZc64PzOo8dc9oHZnHN4u0876ukh VM5w/NXYjDGlhG7+FMJbdUDGoGgZT4WKvQ7NdXn9f8I5fR4hthnMp1OYKFMYYimRM7KC f7Z5P7Ri8EfokFuFWzDbICfLmc1vrInJMBsNb80fmCKI1v+omcJbz3iaTmRNN3fCjNXP OwdOb3ksfAkFd9+PLdSsgS24UJfGcnARUOP9G/dWBf9yBdWY4lp8+q+eWWRDJ1+PsjM0 DNBw== X-Gm-Message-State: AHPjjUir31U+bvPqHVc/W3m0Clk/rQkSIBIFGVJFNN0DgDzD/QJl+loQ 3hF3bDv9pr5CZP7F X-Google-Smtp-Source: AOwi7QAXWnRP227yVgJwZQRl8CjCKuifdtVtdryqVfIlXz/1MEW8Dh9xG+u4uX4FF5aYIMie9krUnw== X-Received: by 10.98.153.198 with SMTP id t67mr503254pfk.62.1505164284580; Mon, 11 Sep 2017 14:11:24 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id q23sm6568745pfk.182.2017.09.11.14.11.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 14:11:23 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 14:11:01 -0700 Message-Id: <1505164269-9455-8-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> References: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V2 08/16] compat: Add check for DST_NOCACHE X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org DST_NOCACHE was removed from the Linux 4.13 kernel. Check if HAVE_DST_NOCACHE is defined for older kernels. Signed-off-by: Greg Rose --- datapath/linux/compat/include/net/ip6_fib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datapath/linux/compat/include/net/ip6_fib.h b/datapath/linux/compat/include/net/ip6_fib.h index 2c8a513..4d58375 100644 --- a/datapath/linux/compat/include/net/ip6_fib.h +++ b/datapath/linux/compat/include/net/ip6_fib.h @@ -27,7 +27,11 @@ static inline u32 rt6_get_cookie(const struct rt6_info *rt) { if (rt->rt6i_flags & RTF_PCPU || - (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) +#ifdef HAVE_DST_NOCACHE + (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) +#else + (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->dst.from)) +#endif rt = (struct rt6_info *)(rt->dst.from); return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;