Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3146159pxu; Tue, 8 Dec 2020 04:54:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAV7eK6fVAsOO24jdJGNBqy/HyyIf3QSJ4qLddawrFA8oOR/FgUNT+DQC0h3Lt4aJ/n0Zd X-Received: by 2002:aa7:da07:: with SMTP id r7mr24400416eds.309.1607432047206; Tue, 08 Dec 2020 04:54:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607432047; cv=none; d=google.com; s=arc-20160816; b=v7sjMIkhhLs4CIHfr27zxVKOpS83MnzybPP5bKGrnQvBjYokLKEtJkiUilNY9ILrBT ZhuJtN3jFenWJESwTHVz5GK3N5BeUHvFJkBURRiZsHAsYtlfiCVsRm6dt/7ROonia0Pf n4rQc0E6DA1JoW4NeIaYQS1VMQNfWKGlQ91wJd2NkWfxHkSSpGZAGqgxgugHDZhFnwQJ UBxYzs5OX3p/VBko7KlHFMT+a1kxFzFUS1FlkMCwcEfDl33Ii26jx2RygLnHx0PCyBu1 7sqU7KtL71kFLSxsbJOBN6YXBwURAtPCCN0CFhAjHJkji2shFe0j6yVB14OVbnNV6tIM 5Bug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=/ieWPE7uz1aRU65rIO74X+BvElNY2dlaygmC9QpoG5s=; b=NsqfJ1m6gvoSBcIAvUGKDfmt2L1KkvJjg4FA4LRxf4tPxGS7IGhO+QiaSOfd8+C4rW vSCwUrdB9iVT6m5B8lu1gzlNvlJMORfr3TLYg4CLOn99KJ/DjrnNZ2yUojmszxohy/SV 5SHSuGOhGurypIy96nmXlROgylLHkaRe+VdYk153eTPBjXX33NlXkUqdmGjQOZ5nJILd OfQr3EZWyryyEbJ30JiyiYKWLhYa2AA1IrFKk1+6iXakxswyn12P10mG0OMVd8nv4bpr UbR1v5NcTvBcjkShyPtB7YfQMHOiztuBAVPZXVa6HxNjXn+ZH5U14tCD0XP4YYVg54kW 5ySw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y3si8075938ejd.505.2020.12.08.04.53.44; Tue, 08 Dec 2020 04:54:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729418AbgLHMOT (ORCPT + 99 others); Tue, 8 Dec 2020 07:14:19 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9036 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727524AbgLHMOS (ORCPT ); Tue, 8 Dec 2020 07:14:18 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CqzbN68LZzhntg; Tue, 8 Dec 2020 20:13:04 +0800 (CST) Received: from ubuntu.network (10.175.138.68) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.487.0; Tue, 8 Dec 2020 20:13:26 +0800 From: Zheng Yongjun To: , , , , , CC: Zheng Yongjun Subject: [PATCH net-next] net: openvswitch: conntrack: simplify the return expression of ovs_ct_limit_get_default_limit() Date: Tue, 8 Dec 2020 20:13:53 +0800 Message-ID: <20201208121353.9353-1-zhengyongjun3@huawei.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.138.68] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify the return expression. Signed-off-by: Zheng Yongjun --- net/openvswitch/conntrack.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 4beb96139d77..96a49aa3a128 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -2025,15 +2025,11 @@ static int ovs_ct_limit_get_default_limit(struct ovs_ct_limit_info *info, struct sk_buff *reply) { struct ovs_zone_limit zone_limit; - int err; zone_limit.zone_id = OVS_ZONE_LIMIT_DEFAULT_ZONE; zone_limit.limit = info->default_limit; - err = nla_put_nohdr(reply, sizeof(zone_limit), &zone_limit); - if (err) - return err; - return 0; + return nla_put_nohdr(reply, sizeof(zone_limit), &zone_limit); } static int __ovs_ct_limit_get_zone_limit(struct net *net, -- 2.22.0