From patchwork Mon Jan 21 12:03:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 214113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 68BFF2C0080 for ; Mon, 21 Jan 2013 23:04:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958Ab3AUMDk (ORCPT ); Mon, 21 Jan 2013 07:03:40 -0500 Received: from mail.us.es ([193.147.175.20]:54788 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335Ab3AUMDh (ORCPT ); Mon, 21 Jan 2013 07:03:37 -0500 Received: (qmail 30368 invoked from network); 21 Jan 2013 13:03:35 +0100 Received: from unknown (HELO us.es) (192.168.2.13) by us.es with SMTP; 21 Jan 2013 13:03:35 +0100 Received: (qmail 30327 invoked by uid 507); 21 Jan 2013 12:03:35 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus3 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.6/16537. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.2/7.5):. Processed in 1.702738 secs); 21 Jan 2013 12:03:35 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus3 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50, RP_MATCHES_RCVD, SPF_HELO_FAIL, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pneira@us.es Received: from unknown (HELO antivirus3) (127.0.0.1) by us.es with SMTP; 21 Jan 2013 12:03:33 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus3 (F-Secure/fsigk_smtp/407/antivirus3); Mon, 21 Jan 2013 13:03:33 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus3) Received: (qmail 28413 invoked from network); 21 Jan 2013 13:03:33 +0100 Received: from 1984.lsi.us.es (HELO us.es) (1984lsi@150.214.188.80) by us.es with AES128-SHA encrypted SMTP; 21 Jan 2013 13:03:33 +0100 Date: Mon, 21 Jan 2013 13:03:33 +0100 From: Pablo Neira Ayuso To: Florian Westphal Cc: netfilter-devel@vger.kernel.org Subject: Re: [PATCH next] iptables: add xt_bpf match Message-ID: <20130121120333.GA5831@1984> References: <1358529450-32413-1-git-send-email-willemb@google.com> <20130121112838.GA2907@1984> <20130121113328.GA3698@1984> <20130121114220.GB8541@breakpoint.cc> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130121114220.GB8541@breakpoint.cc> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Mon, Jan 21, 2013 at 12:42:20PM +0100, Florian Westphal wrote: > Pablo Neira Ayuso wrote: > > On Mon, Jan 21, 2013 at 12:28:38PM +0100, Pablo Neira Ayuso wrote: > > > Hi Willem, > > > > > > I have applied this patch to my nf-next tree with minor changes. > > [..] > > > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > > index 08f555f..8b4bd36 100644 > > --- a/include/uapi/linux/netfilter/Kbuild > > +++ b/include/uapi/linux/netfilter/Kbuild > > @@ -35,6 +35,7 @@ header-y += xt_TCPOPTSTRIP.h > > header-y += xt_TEE.h > > header-y += xt_TPROXY.h > > header-y += xt_addrtype.h > > +header-y += xt_bpf.h > > Good catch. I forgot about that too, so xt_connlabel.h is also missing. Patch attached, thanks for spotting this. From 7a95ad28c40fec445b0e1463fd8ed638701ad94d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 21 Jan 2013 13:02:19 +0100 Subject: [PATCH] netfilter: add missing xt_connlabel.h header in installation Reported-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- include/uapi/linux/netfilter/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 8b4bd36..4111577 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -39,6 +39,7 @@ header-y += xt_bpf.h header-y += xt_cluster.h header-y += xt_comment.h header-y += xt_connbytes.h +header-y += xt_connlabel.h header-y += xt_connlimit.h header-y += xt_connmark.h header-y += xt_conntrack.h -- 1.7.10.4