From patchwork Wed Oct 3 05:32:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 978110 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wand.net.nz Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YRW8XxGs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Q4R74v0Fz9s7W for ; Wed, 3 Oct 2018 15:32:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbeJCMTW (ORCPT ); Wed, 3 Oct 2018 08:19:22 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:45400 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbeJCMTW (ORCPT ); Wed, 3 Oct 2018 08:19:22 -0400 Received: by mail-pl1-f194.google.com with SMTP id y15-v6so2861618plr.12 for ; Tue, 02 Oct 2018 22:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=NDcA0Qasq4sbHeHLE6o27CTGjSxaKZFOZBENKHoRB74=; b=YRW8XxGsNcCvkGfQYpAkbNZl7FSrTitBtTJRHqrfx3M7ZifYzCO3spa4nYfGdD6sKH 7YoXiLAB23ngcxvEhfr40K8v/ydWyuzg2g3Wol2rV2Vuv66ce3mixnAAU/EsAEM8yN3F cOInr7YTeBm3J/ej2HS3aYlIo435/gxtDFHynjbiuxDyu5q2jQCv/2wWh7BUpC7yJYJ0 QlbSPtNqy+5URdulHoQD4uKTaClHqNbeRjjk1WTaqmC0Lc45USSaFawKKDExo7QZP94z RkoinOhJhpngVG1iQSGjtsz090VyJrGYqtHns80PyTXSOh2MeqdOwSgKnis2QK2vepDG AdbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=NDcA0Qasq4sbHeHLE6o27CTGjSxaKZFOZBENKHoRB74=; b=ItcN96EkfWgL2P9DoXUUPN47ruFgr6Vctk5+Op/Io+/lhwhIbNTxr1PsVDlqibZjaW d4fSoU6Lgb+E7rUBQeN6ABB/n0N58NQM19q6VnPRBCg7PuL+lHyzGfvpVCgE2yEc9mkd lBefqxMQtAGmoeYwJoT/9nfa0A8xYKMn9IDybMOs195NAnQbKq3o7gRbExc6QL+JPIX1 cr/76alPF6LQdBMZs0dS1ZbUZAgQh/D57vXtbeeNpwIc8jgBDmaPePh5DuHrXt/eZxXd 5MIxR2Nw/adAD3wtg/wuglJbqDDk4pvmO/agTijuJpBMH/LF5iDAu3eNffa6HbjfVGSr QBxg== X-Gm-Message-State: ABuFfoinY5zPfXn1Wuop3YqxVUZebE58rJtETrlkVDSd+1xdsg5vChY6 Kc6b9Kmwbw++pJ/ovUZG4Lw= X-Google-Smtp-Source: ACcGV62Kj7Ssdi+UEy5TmKZA/k7SCEX/a+9Knj768fStJiH80A+DtNq3k+6hoenGJZ5b7SrhZFteyQ== X-Received: by 2002:a17:902:4381:: with SMTP id j1-v6mr7157414pld.59.1538544753240; Tue, 02 Oct 2018 22:32:33 -0700 (PDT) Received: from localhost.localdomain (c-73-93-5-123.hsd1.ca.comcast.net. [73.93.5.123]) by smtp.gmail.com with ESMTPSA id d2-v6sm501479pfd.100.2018.10.02.22.32.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 22:32:32 -0700 (PDT) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org, ast@kernel.org Subject: [PATCH bpf-next] net: core: Fix build with CONFIG_IPV6=m Date: Tue, 2 Oct 2018 22:32:26 -0700 Message-Id: <20181003053226.16196-1-joe@wand.net.nz> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stephen Rothwell reports the following link failure with IPv6 as module: x86_64-linux-gnu-ld: net/core/filter.o: in function `sk_lookup': (.text+0x19219): undefined reference to `__udp6_lib_lookup' Fix the build by only enabling the IPv6 socket lookup if IPv6 support is compiled into the kernel. Signed-off-by: Joe Stringer --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 591c698bc517..30c6b2d3ef16 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4838,7 +4838,7 @@ struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple, sk = __udp4_lib_lookup(net, src4, tuple->ipv4.sport, dst4, tuple->ipv4.dport, dif, sdif, &udp_table, skb); -#if IS_ENABLED(CONFIG_IPV6) +#if IS_REACHABLE(CONFIG_IPV6) } else { struct in6_addr *src6 = (struct in6_addr *)&tuple->ipv6.saddr; struct in6_addr *dst6 = (struct in6_addr *)&tuple->ipv6.daddr;