diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-08-31 15:56:34 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-08-31 15:56:34 +0200 |
commit | 20a52295775126d1bd5740b6543d1ea8ea239b1b (patch) | |
tree | b6bbaa926241f9edf956938ac1ee062fc7f9b42c /lib/parse.c | |
parent | 4c1941cdeae2d2a580585677565ed690af19279e (diff) |
Propagate "expose userspace-relevant parts in ip_set.h" to ipset source
With the header file restructuring, the ipset userspace enums IPSET_DIM_*
clash with the kernel ones. In this patch the userspace is converted to
use the kernel part enums and thus we got rid of userspace enums IPSET_DIM_*.
Diffstat (limited to 'lib/parse.c')
-rw-r--r-- | lib/parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/parse.c b/lib/parse.c index 2bb0601..1aaf072 100644 --- a/lib/parse.c +++ b/lib/parse.c @@ -1525,9 +1525,9 @@ ipset_call_parser(struct ipset_session *session, #define parse_elem(s, t, d, str) \ do { \ - if (!(t)->elem[d].parse) \ + if (!(t)->elem[d - 1].parse) \ goto internal; \ - ret = (t)->elem[d].parse(s, (t)->elem[d].opt, str); \ + ret = (t)->elem[d - 1].parse(s, (t)->elem[d - 1].opt, str); \ if (ret) \ goto out; \ } while (0) @@ -1582,7 +1582,7 @@ ipset_parse_elem(struct ipset_session *session, } else if (a != NULL) { if (type->compat_parse_elem) { ret = type->compat_parse_elem(session, - type->elem[IPSET_DIM_ONE].opt, + type->elem[IPSET_DIM_ONE - 1].opt, saved); goto out; } |