From patchwork Fri Apr 27 02:52:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 155370 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 DEBFBB6FD8 for ; Fri, 27 Apr 2012 12:52:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758551Ab2D0CwH (ORCPT ); Thu, 26 Apr 2012 22:52:07 -0400 Received: from mail-pz0-f51.google.com ([209.85.210.51]:37402 "EHLO mail-pz0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758110Ab2D0CwF (ORCPT ); Thu, 26 Apr 2012 22:52:05 -0400 Received: by dadz8 with SMTP id z8so354138dad.10 for ; Thu, 26 Apr 2012 19:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=xLHZDLsagBCLktmou6de6AlYQOP30wRChxBwsW4IjPE=; b=VoPUwRlc68VhKgo3CZ/YlYgP0SmVRo8EHo7HeC1JhpYFbpBd0yXanTZQ4RJfn5fWTa lvT0B3RIdzjmLeea3q79vsRTZ0Zt7GZo2MOx7/6nCJVIrtAw+/f3eCg4cRA0sp3xewAN /v1O/Tys0zZusrvynjbQDPwrSbLQqtZ7RvsQ7OIU9Y9TyCt/dRY8lpMknloHIWoMt82Q s5HeXik0tIdZCx3MXp+S+4kgN65x7QeCKec+cyI/WNzFreS/S5tVqAgTrsEGNkwgPYni 6ywCkBLvGu8F2v1a3S+W3IkliDLLzQBAMzn2P9xMbNIhouCkwg1F84AP/bAMIRcB/HFq aHAA== Received: by 10.68.221.202 with SMTP id qg10mr12285968pbc.132.1335495125194; Thu, 26 Apr 2012 19:52:05 -0700 (PDT) Received: from [172.30.10.112] ([113.108.76.195]) by mx.google.com with ESMTPS id r6sm5060151pbl.24.2012.04.26.19.52.02 (version=SSLv3 cipher=OTHER); Thu, 26 Apr 2012 19:52:04 -0700 (PDT) Message-ID: <4F9A0A04.7090703@gmail.com> Date: Fri, 27 Apr 2012 10:52:52 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:12.0) Gecko/20120420 Thunderbird/12.0 MIME-Version: 1.0 To: David Miller CC: NetDev Subject: [PATCH net-next] net: doc: merge /proc/sys/net/core/* documents into one place Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shan Wei All parameter descriptions in /proc/sys/net/core/* now is separated two places. So, merge them into Documentation/sysctl/net.txt. Signed-off-by: Shan Wei --- Documentation/networking/ip-sysctl.txt | 5 +---- Documentation/sysctl/net.txt | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index bd80ba5..9b569a2 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1484,11 +1484,8 @@ addr_scope_policy - INTEGER /proc/sys/net/core/* -dev_weight - INTEGER - The maximum number of packets that kernel can handle on a NAPI - interrupt, it's a Per-CPU variable. + Please see: Documentation/sysctl/net.txt for descriptions of these entries. - Default: 64 /proc/sys/net/unix/* max_dgram_qlen - INTEGER diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index 3201a70..98335b7 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt @@ -43,6 +43,13 @@ Values : 1 - enable the JIT 2 - enable the JIT and ask the compiler to emit traces on kernel log. +dev_weight +-------------- + +The maximum number of packets that kernel can handle on a NAPI interrupt, +it's a Per-CPU variable. +Default: 64 + rmem_default ------------