]> Pileus Git - ~andy/linux/commitdiff
ip6mr: fix rtm_family of rtnl msg
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Tue, 4 Dec 2012 01:01:49 +0000 (01:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Dec 2012 18:27:24 +0000 (13:27 -0500)
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>
net/ipv6/ip6mr.c

index 580e5e084962a848f342eeb2f4606cc9973d3b2e..26dcdec9e3a5f6cbbe799402c39bb5d09c9d561d 100644 (file)
@@ -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;