summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-02-27 13:38:26 +0900
committerSimon Wilson <simonwilson@google.com>2014-09-04 17:41:22 -0700
commit6ef64c612a77dd88da25d06015d44a1c2173e4a9 (patch)
tree4e8d236776c579eb66e48cbf3e1c0e6b84555afd
parent8cf50e31b9d9139eaa6a33ebd53aa64680640784 (diff)
downloadolio-linux-3.10-6ef64c612a77dd88da25d06015d44a1c2173e4a9.tar.xz
olio-linux-3.10-6ef64c612a77dd88da25d06015d44a1c2173e4a9.zip
net: ipv6: ping: Use socket mark in routing lookup
Change-Id: I5a61e0f9f22f193c51b1aafd270fb0642a2e0fab Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ping.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index e2cc17cd1cf..8d1c2064056 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -158,6 +158,7 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
fl6.flowi6_proto = IPPROTO_ICMPV6;
fl6.saddr = np->saddr;
fl6.daddr = *daddr;
+ fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_icmp_type = user_icmph.icmp6_type;
fl6.fl6_icmp_code = user_icmph.icmp6_code;
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));