From patchwork Sun Jan 17 13:32:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 43027 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 4E50EB7CE8 for ; Mon, 18 Jan 2010 00:33:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752020Ab0AQNdP (ORCPT ); Sun, 17 Jan 2010 08:33:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751985Ab0AQNdO (ORCPT ); Sun, 17 Jan 2010 08:33:14 -0500 Received: from mail-fx0-f225.google.com ([209.85.220.225]:34434 "EHLO mail-fx0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747Ab0AQNdN (ORCPT ); Sun, 17 Jan 2010 08:33:13 -0500 Received: by fxm25 with SMTP id 25so335838fxm.21 for ; Sun, 17 Jan 2010 05:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=mrsQdyvbnxWXI3VR/6/AoIKQqWPZxdP6pNXxv75K5bg=; b=nT5amlCXuEVESQVJk9EGtJN5fPtZWEO2TVTLhi7VamOKDEhUzfg5cQzkYXa1eDloV/ Od4k1QrIjxGH2z2++z5eYnTP9BgiJ2l3IN+JHPqcupm5YZnUp5SSFO7IPI4MHCDMraq1 4kNDTKGVi7xb+8BXm2OtBD8zdtwscqL1JOMfc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=OzbFlmWeBTnezPMfy8hhmX+1jTyoVXkgal0eqmrVHmagXt/wD7AbN02DdchIBQajRT 5rhJu+kBVdLJSA6jW0Z1na18iCiHQnviLwkdNUs0IzrvNBecdt7gbz3yNdandI/2nKgY b9JrabbShmfTktlcHUFYGKMPB3qWCoaA34Jjk= Received: by 10.223.94.201 with SMTP id a9mr5984451fan.13.1263735191941; Sun, 17 Jan 2010 05:33:11 -0800 (PST) Received: from x200 ([93.85.107.156]) by mx.google.com with ESMTPS id 31sm2173195fkt.1.2010.01.17.05.33.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 17 Jan 2010 05:33:11 -0800 (PST) Date: Sun, 17 Jan 2010 15:32:50 +0200 From: Alexey Dobriyan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH] ipv4: don't remove /proc/net/rt_acct Message-ID: <20100117133250.GA6178@x200> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org /proc/net/rt_acct is not created if NET_CLS_ROUTE=n. Signed-off-by: Alexey Dobriyan --- net/ipv4/route.c | 2 ++ 1 file changed, 2 insertions(+) -- 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 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -586,7 +586,9 @@ static void __net_exit ip_rt_do_proc_exit(struct net *net) { remove_proc_entry("rt_cache", net->proc_net_stat); remove_proc_entry("rt_cache", net->proc_net); +#ifdef CONFIG_NET_CLS_ROUTE remove_proc_entry("rt_acct", net->proc_net); +#endif } static struct pernet_operations ip_rt_proc_ops __net_initdata = {