diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-03-07 22:27:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-07 22:27:56 -0800 |
| commit | c75a312d8b2c97943014261d71c6ef2622b6d0d9 (patch) | |
| tree | 374a25ac277d787485dc9acf87710e28f50d52bb /net/netfilter/ipset/ip_set_bitmap_ipmac.c | |
| parent | tcp: md5: correct a RCU lockdep splat (diff) | |
| parent | netfilter: xt_LOG: add __printf() to sb_add() (diff) | |
| download | linux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.tar.xz linux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/netfilter/ipset/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index 56096f544978..81324c12c5be 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -543,7 +543,7 @@ init_map_ipmac(struct ip_set *set, struct bitmap_ipmac *map, map->timeout = IPSET_NO_TIMEOUT; set->data = map; - set->family = AF_INET; + set->family = NFPROTO_IPV4; return true; } @@ -623,7 +623,7 @@ static struct ip_set_type bitmap_ipmac_type = { .protocol = IPSET_PROTOCOL, .features = IPSET_TYPE_IP | IPSET_TYPE_MAC, .dimension = IPSET_DIM_TWO, - .family = AF_INET, + .family = NFPROTO_IPV4, .revision_min = 0, .revision_max = 0, .create = bitmap_ipmac_create, |