---

yaml --- r: 341878 b: refs/heads/master c: 193c1e4 h: refs/heads/master v: v3
git-mirror · Dec 4, 2012 · 9da4cf3 · 9da4cf3
1 parent a83735a
commit 9da4cf3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e66ae2ea371cf431283e2cb95480eb860432856
+refs/heads/master: 193c1e478cc496844fcbef402a10976c95a634ff
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
@@ -2251,7 +2251,7 @@ static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
 		return -EMSGSIZE;
 
 	rtm = nlmsg_data(nlh);
-	rtm->rtm_family   = RTNL_FAMILY_IPMR;
+	rtm->rtm_family   = RTNL_FAMILY_IP6MR;
 	rtm->rtm_dst_len  = 128;
 	rtm->rtm_src_len  = 128;
 	rtm->rtm_tos      = 0;