From patchwork Tue Jul 18 22:59:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 790674 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="uUQEGRCH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xBwbQ59vpz9s4s for ; Wed, 19 Jul 2017 08:59:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbdGRW7p (ORCPT ); Tue, 18 Jul 2017 18:59:45 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:34697 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752109AbdGRW7f (ORCPT ); Tue, 18 Jul 2017 18:59:35 -0400 Received: by mail-pf0-f170.google.com with SMTP id q85so18079974pfq.1 for ; Tue, 18 Jul 2017 15:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fw+NOPiaGQOCx26lnPmvinQU0CDDTwifRTJ/NXaJtnA=; b=uUQEGRCHIRb7QOYTSFS25t5vLPN/FISdPIyW2WiCIyWu4avnz9h49jbOfPhxDGvF8Q 5YQ40dbFkBm2Bv1ur8GolAjlcJao+itQMsycg46keWi0PYyPqVNt4VV/fMUCwOHmTNsM He7QVoAPlFLsIdobx5i82DGGuYEHDUG42AakRmcTOL0pkvNlcPLLh8krbel6fMXHJkl5 iOHcS8Zu+j/XI0YFP8Uxdq5BL9Va7pvGTMkZvJl6VkmJHKUj3vZMQ50eNwXXygsiA4mg NF1UVOb+NIcYVkRagQQInWdGhBmnIIL//P8UjNuj7rLcekMOKUNtG/WYphEdDhWW70Oq QcoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fw+NOPiaGQOCx26lnPmvinQU0CDDTwifRTJ/NXaJtnA=; b=bQZvq+1vBvfnP3nabSMh73/4LiJ2zurPWN0zcQo92HS92qw5GXzwni0Zx+AxOgpcbD E6adncKQsAefP6oSPPD4ns2oRQYjd5dbkN9s0i0iB1HXaFOg7hg/tErmYC8RW+WlI4tB WXd4jXRrDjFt3wXPLyz1BjaDXzg/k+9MFzLeYEWRswbWr2fJF0QFNAsVPuzCfZcMIIBE 8HOSv5i3ZFKX3dBzeQOIv0QCiIVfnGP40z1w4g7JUKKOoimTHWPBl+OeVqeKx4xu3/Cw oSXVQUQ+FDFMFgHnWDTvN7Q0S8Kwj2t8yYNi06TuDmnmwPIYNJeXaSSVZkHeHn2YF/yg ZMUw== X-Gm-Message-State: AIVw113wfns3VtD19briIJn44SbvXIZMl4TjsTOOdMfhKo+pg8eka7XS cEWoi40BFd0y7Q3pQUrB9g== X-Received: by 10.84.197.3 with SMTP id m3mr4075780pld.47.1500418774589; Tue, 18 Jul 2017 15:59:34 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id e15sm6617861pfh.81.2017.07.18.15.59.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 15:59:33 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: yisen.zhuang@huawei.com, salil.mehta@huawei.com, davem@davemloft.net, marcel@holtmann.org, gustavo@padovan.org, johan.hedberg@gmail.com Cc: netdev@vger.kernel.org, linux-bluetooth@vger.kernel.org, Stephen Hemminger Subject: [PATCH net-next 3/3] net: make dev_close and related functions void Date: Tue, 18 Jul 2017 15:59:27 -0700 Message-Id: <20170718225927.15944-4-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170718225927.15944-1-sthemmin@microsoft.com> References: <20170718225927.15944-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no useful return value from dev_close. All paths return 0. Change dev_close and helper functions to void. Signed-off-by: Stephen Hemminger --- include/linux/netdevice.h | 4 ++-- net/core/dev.c | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c60351b84323..614642eb7eb7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2432,8 +2432,8 @@ struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); struct net_device *__dev_get_by_name(struct net *net, const char *name); int dev_alloc_name(struct net_device *dev, const char *name); int dev_open(struct net_device *dev); -int dev_close(struct net_device *dev); -int dev_close_many(struct list_head *head, bool unlink); +void dev_close(struct net_device *dev); +void dev_close_many(struct list_head *head, bool unlink); void dev_disable_lro(struct net_device *dev); int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb); int dev_queue_xmit(struct sk_buff *skb); diff --git a/net/core/dev.c b/net/core/dev.c index 467420eda02e..d1b9c9b6c970 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1413,7 +1413,7 @@ int dev_open(struct net_device *dev) } EXPORT_SYMBOL(dev_open); -static int __dev_close_many(struct list_head *head) +static void __dev_close_many(struct list_head *head) { struct net_device *dev; @@ -1455,23 +1455,18 @@ static int __dev_close_many(struct list_head *head) dev->flags &= ~IFF_UP; netpoll_poll_enable(dev); } - - return 0; } -static int __dev_close(struct net_device *dev) +static void __dev_close(struct net_device *dev) { - int retval; LIST_HEAD(single); list_add(&dev->close_list, &single); - retval = __dev_close_many(&single); + __dev_close_many(&single); list_del(&single); - - return retval; } -int dev_close_many(struct list_head *head, bool unlink) +void dev_close_many(struct list_head *head, bool unlink) { struct net_device *dev, *tmp; @@ -1488,8 +1483,6 @@ int dev_close_many(struct list_head *head, bool unlink) if (unlink) list_del_init(&dev->close_list); } - - return 0; } EXPORT_SYMBOL(dev_close_many); @@ -1502,7 +1495,7 @@ EXPORT_SYMBOL(dev_close_many); * is then deactivated and finally a %NETDEV_DOWN is sent to the notifier * chain. */ -int dev_close(struct net_device *dev) +void dev_close(struct net_device *dev) { if (dev->flags & IFF_UP) { LIST_HEAD(single); @@ -1511,7 +1504,6 @@ int dev_close(struct net_device *dev) dev_close_many(&single, true); list_del(&single); } - return 0; } EXPORT_SYMBOL(dev_close); @@ -6725,8 +6717,12 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) */ ret = 0; - if ((old_flags ^ flags) & IFF_UP) - ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev); + if ((old_flags ^ flags) & IFF_UP) { + if (old_flags & IFF_UP) + __dev_close(dev); + else + ret = __dev_open(dev); + } if ((flags ^ dev->gflags) & IFF_PROMISC) { int inc = (flags & IFF_PROMISC) ? 1 : -1;