Merge commit 'v3.17' into next

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 044a0ddf6a79..a3c59a077a5f 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -911,7 +911,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                 sin6->sin6_flowinfo = ip6_flowinfo(ip6);
                         sin6->sin6_scope_id =
                                 ipv6_iface_scope_id(&sin6->sin6_addr,
-                                                    IP6CB(skb)->iif);
+                                                    inet6_iif(skb));
                         *addr_len = sizeof(*sin6);
                 }