Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp439738pxv; Thu, 15 Jul 2021 07:44:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyt+/orfXkx3xl7JRgfQGwQFgozn9TZffkaXxDkkI5XBZ4+dZrnldFm6KVkFXbfUzVAhXZo X-Received: by 2002:a17:906:7d2:: with SMTP id m18mr5947018ejc.229.1626360299265; Thu, 15 Jul 2021 07:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626360299; cv=none; d=google.com; s=arc-20160816; b=Lr2eqM9MtTXARCwMUzqMi68SwH004MkD5e+q2ZIKVdnQ9M/N5VCU7NSrOWEsKbtiJ7 7GecChN5yXSE4/hnmUrMwZFREr6h9ZxD0YDvmvbE8DNBnA7JuXPL7ovr2mw3buDk1Nt0 dOAshnLM+B6JDAGwSRZgbu30tgZFOHky6Z+EGmTUdWVFsfg9MPmgP+xlCURGbdnrNupH 1tRj6U92xypiAJ+USqk9ro9o1YDpYclHK0IamGc3iwLULg91nXFnhUllxOz8sb3TyU9Z amsicimKgLqo0uNj5zgUi60GUIAQUkj0fsEsbQjJGzFrW/ahkDR7RhsXsD2M9tAY4W5N FMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=qzmy22vtGxNQ9QwXd9X5ofTa1eDdi7niNNbh9cI2+4c=; b=SjnkbZr/XA3NNC0+a5VZGclcJmDItZjTY5IuRps08JfBPJ4prTtfWbqywhhEBLOxCx ZfZV2O+9WZgwC7HyJcUUdg/IB5pEXT0uf0RyDkWe2yl3hQ+dMQZ6MyNqFCKo/9nCJqg2 ndp7pqoT+Wcg4lY7btFhjYzIlCOWKfAogtSbo2HGE2EAZzzItIwolH0awyx37W6xIW81 7B4U/8ZshHBlUlJEvMCiF8tNErI4PGITWvtUJy8KHL0aBMMM72sXbuIrSuwVeN/HWVa1 LlpZbCeRecJ9lg5Q1Uja3asgY1ICDms5dAN+kLZjMlQ0j5/zTU3LDJP9qL7geJJXzeY4 LDvA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x25si7236563ejs.544.2021.07.15.07.44.33; Thu, 15 Jul 2021 07:44:59 -0700 (PDT) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237344AbhGOOpZ (ORCPT + 99 others); Thu, 15 Jul 2021 10:45:25 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:47336 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S236981AbhGOOpY (ORCPT ); Thu, 15 Jul 2021 10:45:24 -0400 X-UUID: fc032db9efe144bc8a67ad2b192d7a26-20210715 X-UUID: fc032db9efe144bc8a67ad2b192d7a26-20210715 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1216716974; Thu, 15 Jul 2021 22:42:27 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 15 Jul 2021 22:42:26 +0800 Received: from localhost.localdomain (10.15.20.246) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 15 Jul 2021 22:42:25 +0800 From: Rocco Yue To: "David S . Miller" , Hideaki YOSHIFUJI , David Ahern , Jakub Kicinski , Matthias Brugger CC: , , , , , , Rocco Yue Subject: [PATCH net-next] ipv6: remove unnecessary local variable Date: Thu, 15 Jul 2021 22:26:43 +0800 Message-ID: <20210715142643.2648-1-rocco.yue@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The local variable "struct net *net" in the two functions of inet6_rtm_getaddr() and inet6_dump_addr() are actually useless, so remove them. Signed-off-by: Rocco Yue --- net/ipv6/addrconf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 3bf685fe64b9..e2f625e39455 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5211,8 +5211,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, .netnsid = -1, .type = type, }; - struct net *net = sock_net(skb->sk); - struct net *tgt_net = net; + struct net *tgt_net = sock_net(skb->sk); int idx, s_idx, s_ip_idx; int h, s_h; struct net_device *dev; @@ -5351,7 +5350,7 @@ static int inet6_rtm_valid_getaddr_req(struct sk_buff *skb, static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh, struct netlink_ext_ack *extack) { - struct net *net = sock_net(in_skb->sk); + struct net *tgt_net = sock_net(in_skb->sk); struct inet6_fill_args fillargs = { .portid = NETLINK_CB(in_skb).portid, .seq = nlh->nlmsg_seq, @@ -5359,7 +5358,6 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh, .flags = 0, .netnsid = -1, }; - struct net *tgt_net = net; struct ifaddrmsg *ifm; struct nlattr *tb[IFA_MAX+1]; struct in6_addr *addr = NULL, *peer; -- 2.18.0