From patchwork Mon Sep 16 00:05:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Borowski X-Patchwork-Id: 1162577 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=angband.pl Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46WmjG7038z9sCJ for ; Mon, 16 Sep 2019 10:05:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728884AbfIPAFg (ORCPT ); Sun, 15 Sep 2019 20:05:36 -0400 Received: from tartarus.angband.pl ([54.37.238.230]:46714 "EHLO tartarus.angband.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726502AbfIPAFg (ORCPT ); Sun, 15 Sep 2019 20:05:36 -0400 Received: from [2a02:a31c:853f:a300::4] (helo=valinor.angband.pl) by tartarus.angband.pl with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9eWB-0003hj-CY; Mon, 16 Sep 2019 02:05:25 +0200 Received: from kilobyte by valinor.angband.pl with local (Exim 4.92.2) (envelope-from ) id 1i9eWB-000MEv-3e; Mon, 16 Sep 2019 02:05:23 +0200 From: Adam Borowski To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , Roopa Prabhu , Nikolay Aleksandrov , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Cc: Adam Borowski Date: Mon, 16 Sep 2019 02:05:16 +0200 Message-Id: <20190916000517.45028-1-kilobyte@angband.pl> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a02:a31c:853f:a300::4 X-SA-Exim-Mail-From: kilobyte@angband.pl X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tartarus.angband.pl X-Spam-Level: X-Spam-Status: No, score=-1.1 required=8.0 tests=BAYES_00=-1.9, RDNS_NONE=0.793, SPF_PASS=-0.001 autolearn=no autolearn_force=no languages= Subject: [PATCH] netfilter: bridge: drop a broken include X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on tartarus.angband.pl) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This caused a build failure if CONFIG_NF_CONNTRACK_BRIDGE is set but CONFIG_NF_TABLES=n -- and appears to be unused anyway. Signed-off-by: Adam Borowski --- net/bridge/netfilter/nf_conntrack_bridge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c index 4f5444d2a526..844ef5a53f87 100644 --- a/net/bridge/netfilter/nf_conntrack_bridge.c +++ b/net/bridge/netfilter/nf_conntrack_bridge.c @@ -18,7 +18,6 @@ #include #include -#include #include "../br_private.h"