diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:00:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:01:01 +0200 |
| commit | 40a0c68ca9b49fb3e7292c1bae035ba5bcb27903 (patch) | |
| tree | 11682834d3442d4640c4464709a76a268869ffbd /net/ipv6/esp6.c | |
| parent | c61037e905a5cb74c7d786c35ee2cdbab9ed63af (diff) | |
| parent | 7e3115ef5149fc502e3a2e80719dba54a8e7409d (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in the latest fixes before applying a dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/esp6.c')
| -rw-r--r-- | net/ipv6/esp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index aeac0dc3635..d3618a78fca 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -447,7 +447,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, return; if (type == NDISC_REDIRECT) - ip6_redirect(skb, net, 0, 0); + ip6_redirect(skb, net, skb->dev->ifindex, 0); else ip6_update_pmtu(skb, net, info, 0, 0); xfrm_state_put(x); |