aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-12-03 20:01:49 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-04 13:27:24 -0500
commit193c1e478cc496844fcbef402a10976c95a634ff (patch)
tree64ce45b0286b7e30cb8550e6bb8a371193e03e66 /net/ipv6
parent4e66ae2ea371cf431283e2cb95480eb860432856 (diff)
ip6mr: fix rtm_family of rtnl msg
We talk about IPv6, hence the family is RTNL_FAMILY_IP6MR! rtnl_register() is already called with RTNL_FAMILY_IP6MR. The bug is here since the beginning of this function (commit 5b285cac3570). 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 580e5e084962..26dcdec9e3a5 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2251,7 +2251,7 @@ static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
2251 return -EMSGSIZE; 2251 return -EMSGSIZE;
2252 2252
2253 rtm = nlmsg_data(nlh); 2253 rtm = nlmsg_data(nlh);
2254 rtm->rtm_family = RTNL_FAMILY_IPMR; 2254 rtm->rtm_family = RTNL_FAMILY_IP6MR;
2255 rtm->rtm_dst_len = 128; 2255 rtm->rtm_dst_len = 128;
2256 rtm->rtm_src_len = 128; 2256 rtm->rtm_src_len = 128;
2257 rtm->rtm_tos = 0; 2257 rtm->rtm_tos = 0;