netfilter fixes for 3.4-rc1
Subsystems (2)
[email protected]
maintainercover netfilter fixes for 3.4-rc1
From: Pablo Neira Ayuso <[email protected]>
Hi David,
The following patches contain a couple of small fixes for Netfilter:
* One compilation warning fix for xt_LOG from Jan Beulich.
* Fix compilation issues of user-land ipset with kernel header file from Jan Engelhardt via Jozsef Kadlecsik.
* Fix one compilation warning in the recent changes done in xt_CT to support the extended cttimeout infrastracture, spotted by Eric Dumazet.
You can pull them from:
git://1984.lsi.us.es/net master
Thanks!
Jan Beulich (1):
netfilter: xt_LOG: don't use xchg() for simple assignment
Jan Engelhardt (1):
netfilter: ipset: avoid use of kernel-only types
Pablo Neira Ayuso (1):
netfilter: xt_CT: remove a compile warning
include/linux/netfilter/xt_set.h | 4 ++-- include/net/netfilter/xt_log.h | 2 +- net/netfilter/xt_CT.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 1/3 netfilter: xt_LOG: don't use xchg() for simple assignment
From: Jan Beulich <[email protected]>
At least on ia64 the (bogus) use of xchg() here results in the compiler warning about an unused expression result. As only an assignment is intended here, convert it to such.
--- include/net/netfilter/xt_log.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/net/netfilter/xt_log.h +1 -1
@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)if (likely (m != &emergency))kfree (m);else { -xchg (&emergency_ptr, m); + emergency_ptr = m;local_bh_enable (); } }
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 2/3 netfilter: ipset: avoid use of kernel-only types
In reply to [email protected]From: Jan Engelhardt <[email protected]>
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"
--- include/linux/netfilter/xt_set.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter/xt_set.h +2 -2
@@ -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*/
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 3/3 netfilter: xt_CT: remove a compile warning
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :
CC [M] net/netfilter/xt_CT.onet/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used
--- net/netfilter/xt_CT.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
net/netfilter/xt_CT.c +2 -0
@@ -281,8 +281,10 @@ out: info->ct = ct;return 0 ; +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT err4:rcu_read_unlock (); +#endif err3:nf_conntrack_free (ct); err2:
Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerFrom: [email protected]
Date: Tue, 3 Apr 2012 11:50:55 +0200
Quoted 7 lines
The following patches contain a couple of small fixes for Netfilter:
* One compilation warning fix for
xt_LOGfrom Jan Beulich.* Fix compilation issues of user-land ipset with kernel header file from Jan Engelhardt via Jozsef Kadlecsik.
Quoted 7 lines
* Fix one compilation warning in the recent changes done in
xt_CTto support the extended cttimeout infrastracture, spotted by Eric Dumazet.You can pull them from:
git://1984.lsi.us.es/netmaster
Pulled.