summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-05-15 16:38:41 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-16 16:50:30 -0400
commit2e47b291953c35afa4e20a65475954c1a1b9afe1 (patch)
treee17484d3f6f9825862acf16bbddae1a1f511f716
parent2f67cc87d662e935d2cfaea5a3fb7138ac35c5de (diff)
downloadop-kernel-dev-2e47b291953c35afa4e20a65475954c1a1b9afe1.zip
op-kernel-dev-2e47b291953c35afa4e20a65475954c1a1b9afe1.tar.gz
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. Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.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 58c449a..6ebdb7b6 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2730,6 +2730,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 (iif) {
struct net_device *dev;
int flags = 0;
OpenPOWER on IntegriCloud