From patchwork Tue May 16 17:27:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 763079 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 3wS4Dl6wT7z9s0g for ; Wed, 17 May 2017 03:28:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="zXn4AdRD"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753439AbdEPR2a (ORCPT ); Tue, 16 May 2017 13:28:30 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35734 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751716AbdEPR2M (ORCPT ); Tue, 16 May 2017 13:28:12 -0400 Received: by mail-wm0-f65.google.com with SMTP id v4so39818198wmb.2 for ; Tue, 16 May 2017 10:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BnEaEWcyRAKNllz4N9Wjq/vlSHsLPvzxU8+VI+q0FEE=; b=zXn4AdRDGt4xBvkmKqlAsg/Ke31rAQL9h0uREqO/ozK+VvuiXAxKzra7D2Nd3YHlUH KIKETX2hapAK38Kj4jH0KrNp9ICJe1t3/tY+cKabAkz1d/vZkQlBb1JeNA5/4cVp4mYx vn7r7njPBhJekSl8X7wQ/CZgLAVPiVPkg95AT6uFl5Mjm5Wivz74cVs+XaoeLOxJjfZB v7FQewuBys+VDwjjsWRzYnaaLukuE5E3EOz6n23KEaqqrW2L3IN2pt5WLWzSvUHnZhQt KHqB/sgmDsmPrIOzjNZ9nLEYH7wtH4H40HAudpABChrdV330OMaLzTMZS6n76Ec8Zqja H4TQ== 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=BnEaEWcyRAKNllz4N9Wjq/vlSHsLPvzxU8+VI+q0FEE=; b=YoxLDK8u6M+OYK1+q1JSxQQ+3ICcbhcJIWDRdbtfiJsMdxHXyr7GY3+G8icOimzcDw QWN+AGiTP3EJGaJh56up23d7zssBr6eTPiihXI1yBzB+8h7/MsqtrObRkf6r/fMlBkEC zLcwiUyKMTyoe5mNjydkxmX2XdHGZ2xKz77+7KmV/ZsFoPUQiZhd90HBxPbvWJJC7DEA M+u4+s6RrRnVRJeuI+HZe5dEWsoU6YsFcSqwJ/UpRsgZkOQ6ZiqA5RJhYmPVZ+yiRBwW OBgeaRclSlSuT2Odgf9oTgzt5rrQYMgoqSh1Bvpl7YysnoCeDW5WIqtHIEhh9y+pLBM3 tdnA== X-Gm-Message-State: AODbwcDnDcBZEuxiUxmf4Ky2AvWL+XtWoxBtIy87GyIqq6MPPM0+83a7 krBdy2f/BFw3iw== X-Received: by 10.28.215.13 with SMTP id o13mr3622030wmg.126.1494955691387; Tue, 16 May 2017 10:28:11 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id a24sm2938247wra.17.2017.05.16.10.28.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2017 10:28:10 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, dsa@cumulusnetworks.com, edumazet@google.com, stephen@networkplumber.org, daniel@iogearbox.net, alexander.h.duyck@intel.com, simon.horman@netronome.com, mlxsw@mellanox.com Subject: [patch net-next v3 05/10] net: sched: move TC_H_MAJ macro call into tcf_auto_prio Date: Tue, 16 May 2017 19:27:57 +0200 Message-Id: <20170516172802.1317-6-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170516172802.1317-1-jiri@resnulli.us> References: <20170516172802.1317-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Call the helper from the function rather than to always adjust the return value of the function. Signed-off-by: Jiri Pirko --- net/sched/cls_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 0e49e6e..72624fa 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -125,7 +125,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp) if (tp) first = tp->prio - 1; - return first; + return TC_H_MAJ(first); } static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol, @@ -405,7 +405,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, } if (prio_allocate) - prio = TC_H_MAJ(tcf_auto_prio(rtnl_dereference(*back))); + prio = tcf_auto_prio(rtnl_dereference(*back)); tp = tcf_proto_create(nla_data(tca[TCA_KIND]), protocol, prio, parent, q, block);