diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:09:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:10:50 +0100 |
| commit | a787bdaff83a085288b6fc607afb4bb648da3cc9 (patch) | |
| tree | ec389c1494ef4790ea90f65c4f86e523caf325d0 /net/netfilter/utils.c | |
| parent | 2914b0ba61a9d253535e51af16c7122a8148995d (diff) | |
| parent | 85a2c56cb4454c73f56d3099d96942e7919b292f (diff) | |
| download | lwn-a787bdaff83a085288b6fc607afb4bb648da3cc9.tar.gz lwn-a787bdaff83a085288b6fc607afb4bb648da3cc9.zip | |
Merge branch 'linus' into sched/core, to resolve semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netfilter/utils.c')
| -rw-r--r-- | net/netfilter/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c index cedf47ab3c6f..2182d361e273 100644 --- a/net/netfilter/utils.c +++ b/net/netfilter/utils.c @@ -191,8 +191,8 @@ static int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry skb->mark == rt_info->mark && iph->daddr == rt_info->daddr && iph->saddr == rt_info->saddr)) - return ip_route_me_harder(entry->state.net, skb, - RTN_UNSPEC); + return ip_route_me_harder(entry->state.net, entry->state.sk, + skb, RTN_UNSPEC); } #endif return 0; |