Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273506
b: refs/heads/master
c: 2dad81a
h: refs/heads/master
v: v3
  • Loading branch information
Florian Westphal authored and Pablo Neira Ayuso committed Nov 1, 2011
1 parent a63b9f8 commit 2bb3658
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e23ebf0fa9e1548c94d8277e393be97ba48faa06
refs/heads/master: 2dad81adf2c49aa9f8bb7e7c48dff9261bd58396
13 changes: 10 additions & 3 deletions trunk/net/ipv6/netfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,16 @@ static int nf_ip6_route(struct net *net, struct dst_entry **dst,
.pinet6 = (struct ipv6_pinfo *) &fake_pinfo,
};
const void *sk = strict ? &fake_sk : NULL;

*dst = ip6_route_output(net, sk, &fl->u.ip6);
return (*dst)->error;
struct dst_entry *result;
int err;

result = ip6_route_output(net, sk, &fl->u.ip6);
err = result->error;
if (err)
dst_release(result);
else
*dst = result;
return err;
}

__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
Expand Down

0 comments on commit 2bb3658

Please sign in to comment.