From patchwork Tue Nov 25 06:40:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 414262 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 E17991400D5 for ; Tue, 25 Nov 2014 17:40:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751382AbaKYGkq (ORCPT ); Tue, 25 Nov 2014 01:40:46 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:43283 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbaKYGkp (ORCPT ); Tue, 25 Nov 2014 01:40:45 -0500 Received: by mail-pd0-f178.google.com with SMTP id g10so9205581pdj.9 for ; Mon, 24 Nov 2014 22:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=pDEy8gsPbpp2PcQjmBNtLagZXCMUiZ3satgulM+q/LA=; b=a+YBg259pm0Co0y4GSH0gxmZxt6S9hxWMlFEK0XyAtXPZyu/jBSLr8nJx/GrsY/pJT q/D2Ym2tLGZZPVEY8wYorIFI6eU5F2zr93Wc59fOLjtrJGhlz0D4q8WVaSynrJVX8ijd VMNeTMW6Qhxg0wgTAbClEGxHGPHnuSza0N3iIe6mTy3OPO2wfecEHZgu9k0JiUGVI2Ca EjGaNPKBgo3VW7X5G9UJyLrF1JEGqMDdPyG9P9GdxUELZu9q+4TxCMqxTkD7aiIxzecg kW6CeAuNBIkgfSYKGFjG0zh6rTCTrKthNlcx7M/l5TproVJBgMJfSZMtJ2gojPnoRTpy A8AA== X-Received: by 10.70.118.1 with SMTP id ki1mr40431005pdb.69.1416897645504; Mon, 24 Nov 2014 22:40:45 -0800 (PST) Received: from wind-OptiPlex-780.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id ps2sm428172pdb.62.2014.11.24.22.40.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Nov 2014 22:40:44 -0800 (PST) From: Zhu Yanjun X-Google-Original-From: Zhu Yanjun To: netdev@vger.kernel.org, zyjzyj2000@gmail.com Cc: Zhu Yanjun , Hong Zhiguo , Octavian Purdila , Pavel Emelyanov , Cong Wang , "David S. Miller" Subject: [PATCH 1/1] ipv6: remove unnecessary condition judgement Date: Tue, 25 Nov 2014 14:40:31 +0800 Message-Id: <1416897631-4151-1-git-send-email-Yanjun.Zhu@windriver.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The "init_net" condition judgement in function addrconf_exit_net is introduced in commit 44a6bd29 [Create ipv6 devconf-s for namespaces] to avoid freeing init_net. In commit c900a800 [ipv6: fix bad free of addrconf_init_net], function addrconf_init_net will allocate memory for every net regardless of init_net. In this case, it is unnecessary to make "init_net" condition judgement. CC: Hong Zhiguo CC: Octavian Purdila CC: Pavel Emelyanov CC: Cong Wang CC: David S. Miller Signed-off-by: Zhu Yanjun --- net/ipv6/addrconf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 0169ccf..b8724fc 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5336,10 +5336,8 @@ static void __net_exit addrconf_exit_net(struct net *net) __addrconf_sysctl_unregister(net->ipv6.devconf_dflt); __addrconf_sysctl_unregister(net->ipv6.devconf_all); #endif - if (!net_eq(net, &init_net)) { - kfree(net->ipv6.devconf_dflt); - kfree(net->ipv6.devconf_all); - } + kfree(net->ipv6.devconf_dflt); + kfree(net->ipv6.devconf_all); } static struct pernet_operations addrconf_ops = {