From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22A41C43381 for ; Mon, 25 Feb 2019 04:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E47182087C for ; Mon, 25 Feb 2019 04:14:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="euVTa41M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728434AbfBYEOC (ORCPT ); Sun, 24 Feb 2019 23:14:02 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41909 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726461AbfBYEOC (ORCPT ); Sun, 24 Feb 2019 23:14:02 -0500 Received: by mail-pg1-f194.google.com with SMTP id m1so3840624pgq.8 for ; Sun, 24 Feb 2019 20:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bZma4tpwvh6gM9XMVJrgxTc9JAuVnjGJukHKdfgqe2A=; b=euVTa41MLQ46JLenf7u8L6G9biKA42/VLQmR3W5YQUU6Vzs4Y53wi4zYUlsZ7cs6wF nKinfAeZzvUhx/LoE1jdoYx82EfdGgXHCVBvyHanYncs4LW03QplbPwItqxFR+zCnDUo byVMPO5oteMYqsx6RuD7qSWz8CSX1/YxuBCyqCDWuVPpdL4IGaN1QO78gEww/XJj4Wz1 uxoAaygVpvC7wE5WWxONhqk/3gDJz4Uh4Ivir/boO3QnhH8yqcUpuxV2A+u1Rti6mpRO IyxOD+SODG3OKGYQesA9noDJeIC1tBn436j/UEjEoj/lKEXPU08OtrhMRbNJqSr7N9M5 tF2A== 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:mime-version :content-transfer-encoding; bh=bZma4tpwvh6gM9XMVJrgxTc9JAuVnjGJukHKdfgqe2A=; b=LZsRMg+0CwQ7WPipqT6pGwtAx6828DEN9QMjQ3ePQ3UCbiLyva+b1a4Hv2zDmOwLRw JTAdVL8PmsBETgqAI38wF/VHxWQjqZlvZa0IGCWsWw5wt+tVnhEjuSQ63qK/AJA5BkGw sy0WUudUX+VEnFisMkBl88Lc8gKkVGrhZUrFjClVU0Ufctn0WzUfMxXQJfCKw3gdiTt/ QkxPRsSTcph0/Oc7JUSWJVCC+M8YsU3o7Ujj6YWL8yhXzTGO7avioSJ7BOJ4vidIJvY/ vfZFez7Mm1/P6Dr23n/gYRvBmiqK8sgF0jHjuHOcXWjQ+TLJbIU+7CRyNTtS/oQMJwHW 3jBQ== X-Gm-Message-State: AHQUAuZbjrVjSf9d8oWMsNtgfnLTnVu4YZz+r2vmS4TxcrKOr2ugqYeQ NwJVQ7USYFzM9I9v/gEtbqTDqrTAAMg= X-Google-Smtp-Source: AHgI3IaB72oB4yClgBndC16dipyadgBdRhM65kZU5nyFIYrgDLGhnF5ywGPXvy5RhvUdrT2oB30gog== X-Received: by 2002:a62:18d8:: with SMTP id 207mr18347752pfy.57.1551068041529; Sun, 24 Feb 2019 20:14:01 -0800 (PST) Received: from dhcp-12-139.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id g69sm18629725pfd.168.2019.02.24.20.13.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Feb 2019 20:14:01 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Stefano Brivio , "David S . Miller" , David Ahern , Hangbin Liu Subject: [PATCH net] geneve: use ipv6_mod_enabled to check if ipv6 is disabled Date: Mon, 25 Feb 2019 12:13:50 +0800 Message-Id: <20190225041350.9913-1-liuhangbin@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ipv6_mod_enabled() is more safe and gentle to check if ipv6 is disabled at running time. Fixes: c0a47e44c098 ("geneve: should not call rt6_lookup() when ipv6 was disabled") Signed-off-by: Hangbin Liu --- drivers/net/geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 3377ac66a347..42c5e43ece68 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1514,7 +1514,7 @@ static void geneve_link_config(struct net_device *dev, case AF_INET6: { struct rt6_info *rt; - if (!__in6_dev_get(dev)) + if (!ipv6_mod_enabled()) break; rt = rt6_lookup(geneve->net, &info->key.u.ipv6.dst, NULL, 0, -- 2.19.2