Merge branch 'fix/asoc' into for-linus

[karo-tx-linux.git] / net / netfilter / xt_cluster.c

diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c
index ad5bd890e4e87c05323511e7e6e1a9e93892a673..6c4847662b8541ff1e808d0269518248930ed7f3 100644 (file)
--- a/net/netfilter/xt_cluster.c
+++ b/net/netfilter/xt_cluster.c
@@ -57,6 +57,13 @@ xt_cluster_hash(const struct nf_conn *ct,
        return (((u64)hash * info->total_nodes) >> 32);
 }
 
+static inline bool
+xt_cluster_ipv6_is_multicast(const struct in6_addr *addr)
+{
+       __be32 st = addr->s6_addr32[0];
+       return ((st & htonl(0xFF000000)) == htonl(0xFF000000));
+}
+
 static inline bool
 xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
 {
@@ -67,8 +74,8 @@ xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
                is_multicast = ipv4_is_multicast(ip_hdr(skb)->daddr);
                break;
        case NFPROTO_IPV6:
-               is_multicast = ipv6_addr_type(&ipv6_hdr(skb)->daddr) &
-                                               IPV6_ADDR_MULTICAST;
+               is_multicast =
+                       xt_cluster_ipv6_is_multicast(&ipv6_hdr(skb)->daddr);
                break;
        default:
                WARN_ON(1);