From patchwork Mon Mar 4 20:40:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159619 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4189705jad; Mon, 4 Mar 2019 12:40:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyi8Ox79Jv9NN0Lo0fkGJ5lxDGHW3lmYjB0TEio+1xvU0xdRvEabSKeD1r/oyUVwHcLDKdX X-Received: by 2002:a17:902:8346:: with SMTP id z6mr22709549pln.74.1551732042582; Mon, 04 Mar 2019 12:40:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551732042; cv=none; d=google.com; s=arc-20160816; b=L+kF4rqssvaZgq94MEpF2G5nVKUzaNxTA3l6n72bH3IPWked4SGkUlt8/a0d6394Qc 2LZOnbzpzcCeldiSsWMcpUJJ8EMB+PQTu7SPUT+T/26UTBHLkMYPn/fnboDHRxYHWAc+ MwJy/djfQnBH6EJcwS/5aqRTPrXsPN3EPw5wgMsNrgq/aB7vHHh6zL7lHdlkwPDgr7Y0 KDia6DcmvgWXVbkd+lte0iVdj0FszWCcGVCpJc6nR2WlV24yOz6geuC/pPDwxLg7D5rT 4fr1gfBeFarhcrPornYdb70JRp47Mk+3WTnGnsrNvO0gLQuttpixO3SQrQ8SetpS2ZOA ZUew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=uwNDg7+fw9bWgxMvT1o5P3Pvhx9R3ISIsZyC2drv5/4=; b=TlibVuQJNb7TXd1ny/2amJeIihuWC/5ZNp7fIJDZJ2Ay41Pgsjn67tY7qRl7uVxtOO COuqrXn7/jKLnNzPGMCH5D3Eu2G81voTTAnKijoBweRFiZpYvb1BnJi99PxXRalRrRfd 31RXHXhZtWAaAaHN7yL0Q4E7U16JJwo9yb2mkAkNlXrR2rHZlxw1jKvHvH+29H/mrglB hEWWg6cgoMUgeJYzUttd/ulE7oRnlVBsGafhLZ8rdCtiLYPwEE++WeZ/Qh2ybuNVd3ou CoaVBPzoIBk1vpFy1filnJ8KM774cIeZ7qO483sWev6RiixdsEdGfVQTM+TOFdeEYwGL DCSw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f11si5721012pgs.291.2019.03.04.12.40.42; Mon, 04 Mar 2019 12:40:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726680AbfCDUkk (ORCPT + 31 others); Mon, 4 Mar 2019 15:40:40 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:55217 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726101AbfCDUkk (ORCPT ); Mon, 4 Mar 2019 15:40:40 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1M8xsm-1gvyQi1a6Q-0066QL; Mon, 04 Mar 2019 21:40:22 +0100 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" Cc: Arnd Bergmann , =?utf-8?b?TcOhdMOpIEVja2w=?= , Fernando Fernandez Mancera , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: nf_conntrack_sip: fix IPV6 dependency Date: Mon, 4 Mar 2019 21:40:12 +0100 Message-Id: <20190304204019.2142770-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:AqACvfLz5KyJslLuX6CJ+n57xkzbsTQoy30Pi/s2JNSW8Yfo4QH zU9Y52zixx4e3Q1eAXnKlxI9aNmKDhvCJXP6WDq7u4Q4Qq6xdEyDSNPdHNM0WsqFKu3usj4 kUx9h7UG8J2eHi7rtdlR2pCz/ntZf2+Sqa3xKTU1NbNowYKqbmlr1ADcEiaXjC9REbLO0F7 RIAYbHa9nwvQws1YNstxg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:y/hHEmpsu/U=:A6ZOLaqW9UArD0P/Z5PJG7 IQ49Shbw+ESgBxck2nLWOHQ3zvLK1q0xH/NFl1W6tdZqZMGjYDNsL7zyVMgutCMaPKsV81DK/ rjp4eoexuFb64ED1AEZQuxT/3tm0sjAv2h2ptClStmdW5cXWuEkg2Nj6ob0gxl0+Wa7UQspNC yNYiHlS7XJMhUA3JfbwzVm89qlEIjwSi83M/tmdwH74EwAiqrL8dL4Lb9p8/Qh9RScTwFsO8G bVhbY79bkcfzN7O2AjtINlNyQey+6VCfPPcwbev9XHdJ4QYtKprFWtPfe31EHxD5Jc77rQO0C i6e7FQbluy64vBr+X4CHP7wVcVaXKVtpK769BgFidAO+mpy1cuEHc5LVhSLi4OrSRSjB9C6Cl WuaBzcD2BoL86C2W5XFwhUV7NtZ2bQbrUgoGQj2XK2I2/OFG7rTLZeSirqyVegqSnWtHoBFc+ 1TCfFMoaMJSQK1cBqWJwiqFUof0zyoY769Yehede8FRox44ghKOpRy+OuNVyGzNlgvuewCPOL psYchzBgW5sDb0PEC9N8hmOoF07vS26pCs2n3szWj4EclYxjKAynjkAhNILVTJyP5cen0AAN/ eVnL7chXhqLKu03jg/ZTGSPwdvVM1BR4gANu9ZTKiUN8gnW/bGUftC53Ko84mNyvOj7t9KFKM szmd4Y+aLkM1ZEmPhuwjMNt+s6d1cxBkKQajDi6o7srAPAruvQZWLmh2u65Yf0AOjNvCVdLvS WBnW/oFt7q3WxhAU+YGpXeOFAOGfIYtHtY/BMQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With CONFIG_IPV6=m and CONFIG_NF_CONNTRACK_SIP=y, we now get a link failure: net/netfilter/nf_conntrack_sip.o: In function `process_sdp': nf_conntrack_sip.c:(.text+0x4344): undefined reference to `ip6_route_output_flags' Fix this by adding a dependency that forces CONFIG_NF_CONNTRACK_SIP to be =m when CONFIG_IPV6=m, as we already do for several other drivers with a similar requirement. Fixes: a3419ce3356c ("netfilter: nf_conntrack_sip: add sip_external_media logic") Signed-off-by: Arnd Bergmann --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index d43ffb09939b..964bc317ad0a 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -333,6 +333,7 @@ config NF_CONNTRACK_SANE config NF_CONNTRACK_SIP tristate "SIP protocol support" + depends on IPV6 || IPV6=n default m if NETFILTER_ADVANCED=n help SIP is an application-layer control protocol that can establish,