diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2012-12-04 01:01:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-04 13:27:24 -0500 |
| commit | 193c1e478cc496844fcbef402a10976c95a634ff (patch) | |
| tree | 64ce45b0286b7e30cb8550e6bb8a371193e03e66 /net/ipv6/ip6mr.c | |
| parent | 4e66ae2ea371cf431283e2cb95480eb860432856 (diff) | |
| download | linux-3.10-193c1e478cc496844fcbef402a10976c95a634ff.tar.gz linux-3.10-193c1e478cc496844fcbef402a10976c95a634ff.tar.bz2 linux-3.10-193c1e478cc496844fcbef402a10976c95a634ff.zip | |
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/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 580e5e08496..26dcdec9e3a 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, 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; |