From patchwork Thu Jun 27 23:44:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven-Thorsten Dietrich X-Patchwork-Id: 255245 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 907802C02A1 for ; Fri, 28 Jun 2013 09:45:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754053Ab3F0Xo4 (ORCPT ); Thu, 27 Jun 2013 19:44:56 -0400 Received: from mx0b-000f0801.pphosted.com ([67.231.152.113]:34182 "EHLO mx0b-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753684Ab3F0Xoz (ORCPT ); Thu, 27 Jun 2013 19:44:55 -0400 Received: from pps.filterd (m0000700 [127.0.0.1]) by mx0b-000f0801.pphosted.com (8.14.5/8.14.5) with SMTP id r5RNWml4000449; Thu, 27 Jun 2013 16:44:54 -0700 Received: from hq1wp-exchub01.corp.brocade.com ([144.49.131.13]) by mx0b-000f0801.pphosted.com with ESMTP id 1d8rkwg7qn-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 27 Jun 2013 16:44:54 -0700 Received: from HQ1WP-EXHUB01.corp.brocade.com (10.70.36.14) by HQ1WP-EXCHUB01.corp.brocade.com (10.70.36.99) with Microsoft SMTP Server (TLS) id 14.2.309.2; Thu, 27 Jun 2013 16:44:53 -0700 Received: from HQ1-EXCH02.corp.brocade.com ([fe80::c92a:772e:befa:c34c]) by HQ1WP-EXHUB01.corp.brocade.com ([::1]) with mapi; Thu, 27 Jun 2013 16:44:50 -0700 From: Sven-Thorsten Dietrich To: LKML CC: Stephen Hemminger , "nicolas.dichtel@6wind.com" , "netdev@vger.kernel.org" , Mike Davison Date: Thu, 27 Jun 2013 16:44:47 -0700 Subject: [PATCH] Set the correct RTNL family for multicast netconf messages Thread-Topic: [PATCH] Set the correct RTNL family for multicast netconf messages Thread-Index: Ac5zkE+0NDP4gxTfTsG8Cs8NF9bRPA== Message-ID: <1372376687.21767.10.camel@imac-linux.luckyscavenger.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794, 1.0.431, 0.0.0000 definitions=2013-06-27_09:2013-06-27, 2013-06-27, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1306270208 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There may be other cases that require a special case, so I chose the switch approach. Please note, that all other messages from ipmr[6].c correctly set the family, while these do not. Thanks Sven Subject: Set correct RTNL family for multicast netconf messages From: Sven-Thorsten Dietrich sven@vyatta.com Thu Jun 27 16:40:17 2013 -0700 Date: Thu Jun 27 16:40:17 2013 -0700: diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index dfc39d4..695858b 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1705,7 +1705,16 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex, return -EMSGSIZE; ncm = nlmsg_data(nlh); - ncm->ncm_family = AF_INET; + + switch (type) { + case NETCONFA_MC_FORWARDING: + ncm->ncm_family = RTNL_FAMILY_IPMR; + break; + + default: + ncm->ncm_family = AF_INET; + break; + } if (nla_put_s32(skb, NETCONFA_IFINDEX, ifindex) < 0) goto nla_put_failure; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 4ab4c38..a177da4 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -492,7 +492,16 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex, return -EMSGSIZE; ncm = nlmsg_data(nlh); - ncm->ncm_family = AF_INET6; + + switch (type) { + case NETCONFA_MC_FORWARDING: + ncm->ncm_family = RTNL_FAMILY_IP6MR; + break; + + default: + ncm->ncm_family = AF_INET6; + break; + } if (nla_put_s32(skb, NETCONFA_IFINDEX, ifindex) < 0) goto nla_put_failure;