diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-12-04 23:51:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:04 -0800 |
| commit | 193b23c5a0b270f045a4e77545e9020bfe73d5c4 (patch) | |
| tree | bbd247ed6e98b0a0e59ffd8d5a7ba8bc27402641 | |
| parent | 17dfc93f6d7e5792c9c36dd70c8612721a091ae8 (diff) | |
| download | linux-stable-193b23c5a0b270f045a4e77545e9020bfe73d5c4.tar.gz linux-stable-193b23c5a0b270f045a4e77545e9020bfe73d5c4.tar.bz2 linux-stable-193b23c5a0b270f045a4e77545e9020bfe73d5c4.zip | |
[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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/xt_hashlimit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 49a9e691dc18..951d4c829674 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -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 |