diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-09-01 11:10:10 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-09-01 11:10:19 +0200 |
| commit | 9c0d31cc1eb0a46b1756bd11f9194ddb4b38be0e (patch) | |
| tree | 7e845a9740810ddc42e87d4b4d30c360f708f975 /kernel/include/linux/netfilter/ipset/ip_set.h | |
| parent | 20a52295775126d1bd5740b6543d1ea8ea239b1b (diff) | |
| parent | 5fccd38bbf4892718e58f0b006aa6724aec4f7f8 (diff) | |
Merge branch 'master' of git://dev.medozas.de/ipset
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, 4 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index c853158..e921766 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -290,7 +290,10 @@ struct ip_set_type { u8 features; /* Set type dimension */ u8 dimension; - /* Supported family: may be AF_UNSPEC for both AF_INET/AF_INET6 */ + /* + * Supported family: may be NFPROTO_UNSPEC for both + * NFPROTO_IPV4/NFPROTO_IPV6. + */ u8 family; /* Type revisions */ u8 revision_min, revision_max; |