diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-20 11:54:26 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-20 11:54:35 +0100 |
commit | 57d871ad46bfaed44e556cb872f4bfab1004d9e1 (patch) | |
tree | 05aba4c451f5d6a7025db633d22c556f55d9f351 /kernel/include/linux/netfilter/ipset/ip_set.h | |
parent | 06366c172c487b3038b52e8fe640747b4092a544 (diff) | |
parent | 95b9dfb393232f384ccfc671971a0a9387e138d4 (diff) |
Merge branch 'master' of git://dev.medozas.de/ipset into ipset-5
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set.h')
-rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index df144cc..a3e4bb9 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -240,7 +240,7 @@ struct ip_set_type_variant { /* List set header data */ int (*head)(struct ip_set *set, struct sk_buff *skb); /* List elements */ - int (*list)(struct ip_set *set, struct sk_buff *skb, + int (*list)(const struct ip_set *set, struct sk_buff *skb, struct netlink_callback *cb); /* Return true if "b" set is the same as "a" @@ -383,8 +383,7 @@ ip_set_get_n16(const struct nlattr *attr) return attr->nla_type & NLA_F_NET_BYTEORDER ? value : htons(value); } -static const struct nla_policy -ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] __read_mostly = { +static const struct nla_policy ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] = { [IPSET_ATTR_IPADDR_IPV4] = { .type = NLA_U32 }, [IPSET_ATTR_IPADDR_IPV6] = { .type = NLA_BINARY, .len = sizeof(struct in6_addr) }, |