From patchwork Mon Sep 3 04:37:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 965209 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=brauner.io Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 423chq3n4zz9s3Z for ; Mon, 3 Sep 2018 14:40:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726203AbeICI6o (ORCPT ); Mon, 3 Sep 2018 04:58:44 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:53822 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725892AbeICI6o (ORCPT ); Mon, 3 Sep 2018 04:58:44 -0400 Received: by mail-wm0-f68.google.com with SMTP id b19-v6so10103723wme.3; Sun, 02 Sep 2018 21:40:19 -0700 (PDT) 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=0Ttasv9wAA50TWH1RmglYBXDp2m1htM+fUMfHro5KZg=; b=sbB2COJyBJg8BtdrFr3O1uz3867NMXApilNuhN2LkcqKkLun9/kQRXkzkNklxcZrnv tN/2MP8f/jbl6RDWMhtw3FeE0ppujI5iI9UEqTiYbcGdCpYA8ZsniT+rPrQK8ka7jTxl kEWXTWDAaZCJ/xH8Hn7RQO4skHd8abD2etvmbp/xfH1aW1sZFqJRQeP1/ZeujtTNTr5a zUAlXgl5IPs8kVgsqntdvbZt1+hELd5N9VL9rU2WodChmfxsMmibG9IX2UTKIvp3K/vT wzaaHitzJWOShEHsNCLkRjbP4cDB54khIRdZQDcYG8N40EyG7ThC51HXw0XdiajJHlGC kQiA== X-Gm-Message-State: APzg51AzJtPwcuz42ysBLr0nfAY3D0wupfLek/3XH1LIm6ubpI3arDGL tvOzRl0F49JKA0oeg976NbH4PvfRuy2+lw== X-Google-Smtp-Source: ANB0VdZawAX0s1mdbLGugqOsIrHxb88cKb9qNHcYNMRm/8qt/xBm5htH3xrs5VL6O0hA5R5+yvMDXw== X-Received: by 2002:a1c:ae94:: with SMTP id x142-v6mr4239910wme.125.1535949618361; Sun, 02 Sep 2018 21:40:18 -0700 (PDT) Received: from localhost.localdomain ([88.128.81.0]) by smtp.gmail.com with ESMTPSA id j66-v6sm22453364wrj.28.2018.09.02.21.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Sep 2018 21:40:17 -0700 (PDT) From: Christian Brauner To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.net, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, pombredanne@nexb.com, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, dsahern@gmail.com, fw@strlen.de, ktkhai@virtuozzo.com, lucien.xin@gmail.com, jakub.kicinski@netronome.com, jbenc@redhat.com, nicolas.dichtel@6wind.com, Christian Brauner Subject: [PATCH net-next v1 5/5] rtnetlink: move type calculation out of loop Date: Mon, 3 Sep 2018 06:37:17 +0200 Message-Id: <20180903043717.20136-6-christian@brauner.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903043717.20136-1-christian@brauner.io> References: <20180903043717.20136-1-christian@brauner.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I don't see how the type - which is one of RTM_{GETADDR,GETROUTE,GETNETCONF} - can change. So do the message type calculation once before entering the for loop. Signed-off-by: Christian Brauner --- v0->v1: - unchanged --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 30645d9a9801..b36dab7507a0 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3265,13 +3265,13 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) { int idx; int s_idx = cb->family; + int type = cb->nlh->nlmsg_type - RTM_BASE; if (s_idx == 0) s_idx = 1; for (idx = 1; idx <= RTNL_FAMILY_MAX; idx++) { struct rtnl_link **tab; - int type = cb->nlh->nlmsg_type-RTM_BASE; struct rtnl_link *link; rtnl_dumpit_func dumpit;