From patchwork Sun Sep 23 03:49:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 186180 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 1FDF92C0093 for ; Sun, 23 Sep 2012 13:49:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753537Ab2IWDtX (ORCPT ); Sat, 22 Sep 2012 23:49:23 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:6254 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753480Ab2IWDtW (ORCPT ); Sat, 22 Sep 2012 23:49:22 -0400 X-IronPort-AV: E=Sophos;i="4.80,469,1344182400"; d="scan'208";a="5891222" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 23 Sep 2012 11:48:01 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q8N3nJww026082; Sun, 23 Sep 2012 11:49:19 +0800 Received: from Donkey.fnst.cn.fujitsu.com ([10.167.225.206]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012092311493771-5340 ; Sun, 23 Sep 2012 11:49:37 +0800 From: Gao feng To: davem@davemloft.net, kuznet@ms2.inr.ac.ru Cc: netdev@vger.kernel.org, Gao feng Subject: [PATCH] inet_diag: make config INET_DIAG bool Date: Sun, 23 Sep 2012 11:49:14 +0800 Message-Id: <1348372154-20663-1-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7.6 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/09/23 11:49:37, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/09/23 11:49:38, Serialize complete at 2012/09/23 11:49:38 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org when inet_diag being compiled as module, inet_diag_handler_dump set netlink_dump_control.dump to inet_diag_dump,so if module inet_diag is unloaded,netlink will still try to call this function in netlink_dump. this will cause kernel panic. this patch makes config INET_DIAG bool to avoid inet_diag being compiled as module. Signed-off-by: Gao feng --- net/ipv4/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 5a19aeb..da56f84 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -403,7 +403,7 @@ config INET_LRO If unsure, say Y. config INET_DIAG - tristate "INET: socket monitoring interface" + bool "INET: socket monitoring interface" default y ---help--- Support for INET (TCP, DCCP, etc) socket monitoring interface used by