From patchwork Mon Feb 25 04:41:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 222844 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 C88002C02A5 for ; Mon, 25 Feb 2013 15:42:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759882Ab3BYEmM (ORCPT ); Sun, 24 Feb 2013 23:42:12 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:5234 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1759714Ab3BYEmL (ORCPT ); Sun, 24 Feb 2013 23:42:11 -0500 X-IronPort-AV: E=Sophos;i="4.84,732,1355068800"; d="scan'208";a="6761872" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 25 Feb 2013 12:39:03 +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 r1P4fMok017720; Mon, 25 Feb 2013 12:41:22 +0800 Received: from Donkey.fnst.cn.fujitsu.com ([10.167.233.107]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013022512403482-379211 ; Mon, 25 Feb 2013 12:40:34 +0800 From: Gao feng To: davem@davemloft.net Cc: netdev@vger.kernel.org, Gao feng Subject: [PATCH] net: remove the unnecessary list_del Date: Mon, 25 Feb 2013 12:41:56 +0800 Message-Id: <1361767316-28583-1-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/25 12:40:34, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/25 12:40:35, Serialize complete at 2013/02/25 12:40:35 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These lists are used by unregister_netdevice_many, they are local variables,will not be seen by others. there is no need to delete them. Signed-off-by: Gao feng --- drivers/net/macvlan.c | 1 - net/core/dev.c | 1 - net/core/rtnetlink.c | 1 - net/mac80211/iface.c | 1 - 4 files changed, 4 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index defcd8a..9b728f1 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -945,7 +945,6 @@ static int macvlan_device_event(struct notifier_block *unused, list_for_each_entry_safe(vlan, next, &port->vlans, list) vlan->dev->rtnl_link_ops->dellink(vlan->dev, &list_kill); unregister_netdevice_many(&list_kill); - list_del(&list_kill); break; case NETDEV_PRE_TYPE_CHANGE: /* Forbid underlaying device to change its type. */ diff --git a/net/core/dev.c b/net/core/dev.c index 18d8b5a..7c5e9d2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6172,7 +6172,6 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list) } } unregister_netdevice_many(&dev_kill_list); - list_del(&dev_kill_list); rtnl_unlock(); } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d8aa20f..8e35210 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1613,7 +1613,6 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) ops->dellink(dev, &list_kill); unregister_netdevice_many(&list_kill); - list_del(&list_kill); return 0; } diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 2c059e5..a799629 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1639,7 +1639,6 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) } mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); - list_del(&unreg_list); list_for_each_entry_safe(sdata, tmp, &wdev_list, list) { list_del(&sdata->list);