diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-03-19 11:13:20 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-03-19 11:13:20 +0100 |
| commit | 9d001ebc259d84a91321b0c339e55e5b0557ef1b (patch) | |
| tree | d104dd2dbea2b8596166674b438c5b97c1969d1e | |
| parent | f284b0d07b5d99e745312cbcc0fd95a6a4a7f5b4 (diff) | |
Fix revision reporting
Revision reporting got broken by the revision checking patch, fixed.
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 2 | ||||
| -rw-r--r-- | lib/types.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index 295c803..237fc2a 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/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(); diff --git a/lib/types.c b/lib/types.c index f0dbbc9..402e726 100644 --- a/lib/types.c +++ b/lib/types.c @@ -216,7 +216,7 @@ create_type_get(struct ipset_session *session) && MATCH_FAMILY(t, family)) { if (match == NULL) { match = t; - tmax = t->revision; + tmin = tmax = t->revision; } else if (t->family == match->family) tmin = t->revision; } @@ -240,11 +240,10 @@ create_type_get(struct ipset_session *session) if (ret != 0) return NULL; - kmax = *(const uint8_t *)ipset_data_get(data, IPSET_OPT_REVISION); + kmin = kmax = *(const uint8_t *)ipset_data_get(data, IPSET_OPT_REVISION); if (ipset_data_test(data, IPSET_OPT_REVISION_MIN)) kmin = *(const uint8_t *)ipset_data_get(data, IPSET_OPT_REVISION_MIN); - else - kmin = kmax; + if (MAX(tmin, kmin) > MIN(tmax, kmax)) { if (kmin > tmax) return ipset_errptr(session, |