From cf135c76d94bd6d06ed88cb8f3cdfe53ab429da9 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 4 Dec 2012 14:46:34 -0500
Subject: [PATCH] --- yaml --- r: 341879 b: refs/heads/master c:
 b1afce9538eef6239798ec54cead3c39d69724ca h: refs/heads/master i:   341877:
 a83735a1712eaacc928a53e61a61d3b246c15486   341875:
 43378efc38526e26e56f8809f17b898523b3ad5c   341871:
 c7752d9d06d632b6cda6d432a9760158d36248d8 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0f626290d47..e73edb1e90ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 193c1e478cc496844fcbef402a10976c95a634ff
+refs/heads/master: b1afce9538eef6239798ec54cead3c39d69724ca
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 28e0e627229c..6fca01f136ad 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -469,8 +469,10 @@ static int inet6_netconf_msgsize_devconf(int type)
 	/* type -1 is used for ALL */
 	if (type == -1 || type == NETCONFA_FORWARDING)
 		size += nla_total_size(4);
+#ifdef CONFIG_IPV6_MROUTE
 	if (type == -1 || type == NETCONFA_MC_FORWARDING)
 		size += nla_total_size(4);
+#endif
 
 	return size;
 }
@@ -498,11 +500,12 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
 	if ((type == -1 || type == NETCONFA_FORWARDING) &&
 	    nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
 		goto nla_put_failure;
+#ifdef CONFIG_IPV6_MROUTE
 	if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
 	    nla_put_s32(skb, NETCONFA_MC_FORWARDING,
 			devconf->mc_forwarding) < 0)
 		goto nla_put_failure;
-
+#endif
 	return nlmsg_end(skb, nlh);
 
 nla_put_failure: