Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 193b23c5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: xt_hashlimit: remove ip6tables module dependency 



Switch from ipv6_find_hdr to ipv6_skip_exthdr to avoid pulling in ip6_tables
and ipv6 when only using it for IPv4.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17dfc93f

net/netfilter/xt_hashlimit.c

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/in.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <net/ipv6.h>

#include <net/net_namespace.h>



#include <linux/netfilter/x_tables.h>
@@ -379,7 +380,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, 
		   const struct sk_buff *skb, unsigned int protoff)

{

	__be16 _ports[2], *ports;

	int nexthdr;

	u8 nexthdr;



	memset(dst, 0, sizeof(*dst));
@@ -407,8 +408,9 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, 
		if (!(hinfo->cfg.mode &

		      (XT_HASHLIMIT_HASH_DPT | XT_HASHLIMIT_HASH_SPT)))

			return 0;

		nexthdr = ipv6_find_hdr(skb, &protoff, -1, NULL);

		if (nexthdr < 0)

		nexthdr = ipv6_hdr(skb)->nexthdr;

		protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr);

		if ((int)protoff < 0)

			return -1;

		break;

#endif