From patchwork Tue Apr 12 09:49:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 90762 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 0EBAAB6F19 for ; Tue, 12 Apr 2011 19:49:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756940Ab1DLJti (ORCPT ); Tue, 12 Apr 2011 05:49:38 -0400 Received: from gw1.transmode.se ([195.58.98.146]:35316 "EHLO gw1.transmode.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753523Ab1DLJth (ORCPT ); Tue, 12 Apr 2011 05:49:37 -0400 Received: from sesr04.transmode.se (sesr04.transmode.se [192.168.201.15]) by gw1.transmode.se (Postfix) with ESMTP id 3A757258003 for ; Tue, 12 Apr 2011 11:49:36 +0200 (CEST) Received: from gentoo-jocke.transmode.se ([172.20.4.10]) by sesr04.transmode.se (Lotus Domino Release 8.5.2FP1) with ESMTP id 2011041211493616-6985 ; Tue, 12 Apr 2011 11:49:36 +0200 Received: from gentoo-jocke.transmode.se (localhost [127.0.0.1]) by gentoo-jocke.transmode.se (8.14.4/8.14.0) with ESMTP id p3C9nZT6024331; Tue, 12 Apr 2011 11:49:35 +0200 Received: (from jocke@localhost) by gentoo-jocke.transmode.se (8.14.4/8.14.4/Submit) id p3C9nZQ0024330; Tue, 12 Apr 2011 11:49:35 +0200 From: Joakim Tjernlund To: netdev@vger.kernel.org Cc: Joakim Tjernlund Subject: [PATCH] net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST Date: Tue, 12 Apr 2011 11:49:34 +0200 Message-Id: <1302601774-24289-1-git-send-email-Joakim.Tjernlund@transmode.se> X-Mailer: git-send-email 1.7.3.4 X-MIMETrack: Itemize by SMTP Server on sesr04/Transmode(Release 8.5.2FP1|November 29, 2010) at 2011-04-12 11:49:36, Serialize by Router on sesr04/Transmode(Release 8.5.2FP1|November 29, 2010) at 2011-04-12 11:49:36, Serialize complete at 2011-04-12 11:49:36 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org controlling igmp_max_membership is useful even when IP_MULTICAST is off. Quagga(an OSPF deamon) uses multicast addresses for all interfaces using a single socket and hits igmp_max_membership limit when there are 20 interfaces or more. Always export sysctl igmp_max_memberships in proc, just like igmp_max_msf Signed-off-by: Joakim Tjernlund --- net/ipv4/sysctl_net_ipv4.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index d96c1da..9cc2824 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -306,7 +306,6 @@ static struct ctl_table ipv4_table[] = { .mode = 0644, .proc_handler = proc_do_large_bitmap, }, -#ifdef CONFIG_IP_MULTICAST { .procname = "igmp_max_memberships", .data = &sysctl_igmp_max_memberships, @@ -314,8 +313,6 @@ static struct ctl_table ipv4_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, - -#endif { .procname = "igmp_max_msf", .data = &sysctl_igmp_max_msf,