From patchwork Tue Apr 3 09:50:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 150363 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 840F2B6FE4 for ; Tue, 3 Apr 2012 19:51:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751656Ab2DCJvo (ORCPT ); Tue, 3 Apr 2012 05:51:44 -0400 Received: from mail.us.es ([193.147.175.20]:55630 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753204Ab2DCJvo (ORCPT ); Tue, 3 Apr 2012 05:51:44 -0400 Received: (qmail 17544 invoked from network); 3 Apr 2012 11:51:42 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 3 Apr 2012 11:51:42 +0200 Received: (qmail 4600 invoked by uid 507); 3 Apr 2012 09:51:39 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50, USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.4/14735. Clear:RC:1(127.0.0.1):. Processed in 0.02438 secs); 03 Apr 2012 09:51:39 -0000 Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 3 Apr 2012 09:51:39 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Tue, 03 Apr 2012 11:51:39 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 20386 invoked from network); 3 Apr 2012 11:51:38 +0200 Received: from berligate.hmw-consulting.de (HELO soleta.de.gnumonks.org) (pneira@us.es@83.236.178.202) by us.es with SMTP; 3 Apr 2012 11:51:38 +0200 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net Subject: [PATCH 2/3] netfilter: ipset: avoid use of kernel-only types Date: Tue, 3 Apr 2012 11:50:57 +0200 Message-Id: <1333446658-2335-3-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1333446658-2335-1-git-send-email-pablo@netfilter.org> References: <1333446658-2335-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Jan Engelhardt When using the xt_set.h header in userspace, one will get these gcc reports: ipset/ip_set.h:184:1: error: unknown type name "u16" In file included from libxt_SET.c:21:0: netfilter/xt_set.h:61:2: error: unknown type name "u32" netfilter/xt_set.h:62:2: error: unknown type name "u32" Signed-off-by: Jan Engelhardt Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso --- include/linux/netfilter/xt_set.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h index c0405ac..e3a9978 100644 --- a/include/linux/netfilter/xt_set.h +++ b/include/linux/netfilter/xt_set.h @@ -58,8 +58,8 @@ struct xt_set_info_target_v1 { struct xt_set_info_target_v2 { struct xt_set_info add_set; struct xt_set_info del_set; - u32 flags; - u32 timeout; + __u32 flags; + __u32 timeout; }; #endif /*_XT_SET_H*/