aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-02-27 13:38:26 +0900
committerZiyann <jaraidaniel@gmail.com>2014-11-26 21:33:47 +0100
commit5dc7afab9fd21e5cf32baf86b24e6fe5a98ce0b7 (patch)
tree8d72de0af27063a12c3cd11448a95bb4084f8290 /net
parent262ba71cb628cc48bb06c78b8735a7a44dd0bb9c (diff)
downloadkernel_samsung_tuna-5dc7afab9fd21e5cf32baf86b24e6fe5a98ce0b7.zip
kernel_samsung_tuna-5dc7afab9fd21e5cf32baf86b24e6fe5a98ce0b7.tar.gz
kernel_samsung_tuna-5dc7afab9fd21e5cf32baf86b24e6fe5a98ce0b7.tar.bz2
net: ipv6: ping: Use socket mark in routing lookup
[net-next commit bf439b3154ce49d81a79b14f9fab18af99018ae2] Change-Id: I8356e9132088c75d4510021c6e4c2641d772087a Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '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 99456ef..0082212 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;
fl6.flowi6_uid = sock_i_uid(sk);