Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / ip6t_REJECT.c

diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index 14316c3ebde41642816fa12cd15021b0fa1ad049..c745717b4ce2165d0d8b73a415c4cf229b88df00 100644 (file)
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -100,11 +100,8 @@ static void send_reset(struct sk_buff *oldskb)
        dst = ip6_route_output(NULL, &fl);
        if (dst == NULL)
                return;
-       if (dst->error ||
-           xfrm_lookup(&dst, &fl, NULL, 0)) {
-               dst_release(dst);
+       if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0))
                return;
-       }
 
        hh_len = (dst->dev->hard_header_len + 15)&~15;
        nskb = alloc_skb(hh_len + 15 + dst->header_len + sizeof(struct ipv6hdr)
@@ -221,12 +218,13 @@ static unsigned int reject6_target(struct sk_buff **pskb,
 }
 
 static int check(const char *tablename,
-                const struct ip6t_entry *e,
+                const void *entry,
                 void *targinfo,
                 unsigned int targinfosize,
                 unsigned int hook_mask)
 {
        const struct ip6t_reject_info *rejinfo = targinfo;
+       const struct ip6t_entry *e = entry;
 
        if (targinfosize != IP6T_ALIGN(sizeof(struct ip6t_reject_info))) {
                DEBUGP("ip6t_REJECT: targinfosize %u != 0\n", targinfosize);