Patchwork ip6mr: fix rtm_family of rtnl msg

login
register
mail settings
Submitter Nicolas Dichtel
Date Dec. 4, 2012, 11:01 a.m.
Message ID <1354618909-15631-1-git-send-email-nicolas.dichtel@6wind.com>
Download mbox | patch
Permalink /patch/203596/
State Accepted
Delegated to: David Miller
Headers show

Comments

Nicolas Dichtel - Dec. 4, 2012, 11:01 a.m.
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>
---
 net/ipv6/ip6mr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - Dec. 4, 2012, 6:27 p.m.
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Tue,  4 Dec 2012 12:01:49 +0100

> 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>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index f7c7c63..940aa52 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2212,7 +2212,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;