netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] netfilter:ipset fix revision reporting
@ 2011-03-19 10:10 Jozsef Kadlecsik
  2011-03-20 14:35 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Jozsef Kadlecsik @ 2011-03-19 10:10 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Patrick McHardy, Jozsef Kadlecsik

Hi Patrick,

Sorry, my last patch broke the revision reporting (I should have ran the
testsuite first). So please apply this patch on top of the previous ones.

Best regards,
Jozsef

The patch 'netfilter:ipset: fix checking the type revision at create command'
broke the set type revisioning.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---
 net/netfilter/ipset/ip_set_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index b11cc5e..d6b4823 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -136,7 +136,7 @@ find_set_type_minmax(const char *name, u8 family, u8 *min, u8 *max)
 			found = true;
 			if (type->revision < *min)
 				*min = type->revision;
-			else if (type->revision > *max)
+			if (type->revision > *max)
 				*max = type->revision;
 		}
 	rcu_read_unlock();
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] netfilter:ipset fix revision reporting
  2011-03-19 10:10 [PATCH] netfilter:ipset fix revision reporting Jozsef Kadlecsik
@ 2011-03-20 14:35 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2011-03-20 14:35 UTC (permalink / raw)
  To: Jozsef Kadlecsik; +Cc: netfilter-devel

Am 19.03.2011 11:10, schrieb Jozsef Kadlecsik:
> Hi Patrick,
> 
> Sorry, my last patch broke the revision reporting (I should have ran the
> testsuite first). So please apply this patch on top of the previous ones.

I folded this into patch 2/2, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-20 14:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-19 10:10 [PATCH] netfilter:ipset fix revision reporting Jozsef Kadlecsik
2011-03-20 14:35 ` Patrick McHardy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).