aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-12-03 20:13:38 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-04 13:08:11 -0500
commit9a68ac72a44ecb6d4dc4a7cadf45e1a2cd183885 (patch)
treebbf480f5b1f5a246e5f6f38a0b79dad1a29a7269 /net/ipv6
parentadfa85e45dac616ff4f8bfceff1621ccafc0b1ff (diff)
ipmr/ip6mr: report origin of mfc entry into rtnl msg
A mfc entry can be static or not (added via the mroute_sk socket). The patch reports MFC_STATIC flag into rtm_protocol by setting rtm_protocol to RTPROT_STATIC or RTPROT_MROUTED. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6mr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 4220a7b93386..d51b91122866 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2249,7 +2249,10 @@ static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
2249 if (nla_put_u32(skb, RTA_TABLE, mrt->id)) 2249 if (nla_put_u32(skb, RTA_TABLE, mrt->id))
2250 goto nla_put_failure; 2250 goto nla_put_failure;
2251 rtm->rtm_scope = RT_SCOPE_UNIVERSE; 2251 rtm->rtm_scope = RT_SCOPE_UNIVERSE;
2252 rtm->rtm_protocol = RTPROT_UNSPEC; 2252 if (c->mfc_flags & MFC_STATIC)
2253 rtm->rtm_protocol = RTPROT_STATIC;
2254 else
2255 rtm->rtm_protocol = RTPROT_MROUTED;
2253 rtm->rtm_flags = 0; 2256 rtm->rtm_flags = 0;
2254 2257
2255 if (nla_put(skb, RTA_SRC, 16, &c->mf6c_origin) || 2258 if (nla_put(skb, RTA_SRC, 16, &c->mf6c_origin) ||