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

Commit 94e6721d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents e2aec372 499031ac

net/ipv6/netfilter/ip6t_REJECT.c

+4 −2
Original line number Diff line number Diff line
@@ -97,9 +97,11 @@ static void send_reset(struct net *net, struct sk_buff *oldskb) 
	fl.fl_ip_dport = otcph.source;

	security_skb_classify_flow(oldskb, &fl);

	dst = ip6_route_output(net, NULL, &fl);

	if (dst == NULL)

	if (dst == NULL || dst->error) {

		dst_release(dst);

		return;

	if (dst->error || xfrm_lookup(net, &dst, &fl, NULL, 0))

	}

	if (xfrm_lookup(net, &dst, &fl, NULL, 0))

		return;



	hh_len = (dst->dev->hard_header_len + 15)&~15;