3 files changed, 9 insertions, 2 deletions

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 80abe27dc2a7..33d29cea37ea 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -227,6 +227,7 @@ enum {
 #define RTPROT_XORP     14      /* XORP */
 #define RTPROT_NTK      15      /* Netsukuku */
 #define RTPROT_DHCP     16      /* DHCP client */
+#define RTPROT_MROUTED  17      /* Multicast daemon */
 
 /* rtm_scope
 
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index c5617d646b93..91782a7634c2 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2169,7 +2169,10 @@ static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
                 goto nla_put_failure;
         rtm->rtm_type     = RTN_MULTICAST;
         rtm->rtm_scope    = RT_SCOPE_UNIVERSE;
-        rtm->rtm_protocol = RTPROT_UNSPEC;
+        if (c->mfc_flags & MFC_STATIC)
+                rtm->rtm_protocol = RTPROT_STATIC;
+        else
+                rtm->rtm_protocol = RTPROT_MROUTED;
         rtm->rtm_flags    = 0;
 
         if (nla_put_be32(skb, RTA_SRC, c->mfc_origin) ||
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,
         if (nla_put_u32(skb, RTA_TABLE, mrt->id))
                 goto nla_put_failure;
         rtm->rtm_scope    = RT_SCOPE_UNIVERSE;
-        rtm->rtm_protocol = RTPROT_UNSPEC;
+        if (c->mfc_flags & MFC_STATIC)
+                rtm->rtm_protocol = RTPROT_STATIC;
+        else
+                rtm->rtm_protocol = RTPROT_MROUTED;
         rtm->rtm_flags    = 0;
 
         if (nla_put(skb, RTA_SRC, 16, &c->mf6c_origin) ||