Commit 6bd14303 authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_queue: get rid of dependency on IP6_NF_IPTABLES 



hash_v6 is used by both nftables and ip6tables, so depend on
IP6_NF_IPTABLES is not properly.

Actually, it only parses ipv6hdr and computes a hash value, so
even if IPV6 is disabled, there's no side effect too, remove it.

Signed-off-by: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 23d07508

include/net/netfilter/nf_queue.h

+0 −4
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static inline u32 hash_v4(const struct sk_buff *skb, u32 jhash_initval) 
			(__force u32)iph->saddr, iph->protocol, jhash_initval);

}



#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)

static inline u32 hash_v6(const struct sk_buff *skb, u32 jhash_initval)

{

	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
@@ -77,7 +76,6 @@ static inline u32 hash_v6(const struct sk_buff *skb, u32 jhash_initval) 


	return jhash_3words(a, b, c, jhash_initval);

}

#endif



static inline u32

nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family,
@@ -85,10 +83,8 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, 
{

	if (family == NFPROTO_IPV4)

		queue += ((u64) hash_v4(skb, jhash_initval) * queues_total) >> 32;

#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)

	else if (family == NFPROTO_IPV6)

		queue += ((u64) hash_v6(skb, jhash_initval) * queues_total) >> 32;

#endif



	return queue;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE