aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-05-15 16:38:41 -0700
committerMister Oyster <oysterized@gmail.com>2017-04-11 10:59:56 +0200
commiteb3e4296eb75ea8d2ebca84eeda2a900bda735c6 (patch)
tree5c4f99f4e507120aa759574eb9302c0c793afb56 /net
parentac7685554da7a70df708f2dbb5e1fbefd81349b2 (diff)
net: ipv6: make "ip -6 route get mark xyz" work.
Currently, "ip -6 route get mark xyz" ignores the mark passed in by userspace. Make it honour the mark, just like IPv4 does. [net-next commit 2e47b291953c35afa4e20a65475954c1a1b9afe1] Change-Id: Ief6cd1e1b7e43dc0d008b7e692be62cadc5cc7ca 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/route.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9f4b790cc..5c5ca508f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2635,6 +2635,9 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh)
if (tb[RTA_OIF])
oif = nla_get_u32(tb[RTA_OIF]);
+ if (tb[RTA_MARK])
+ fl6.flowi6_mark = nla_get_u32(tb[RTA_MARK]);
+
if (tb[RTA_UID])
fl6.flowi6_uid = make_kuid(current_user_ns(),
nla_get_u32(tb[RTA_UID]));