From patchwork Tue Jun 20 20:11:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106016 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1581286qgd; Tue, 20 Jun 2017 13:12:29 -0700 (PDT) X-Received: by 10.84.210.40 with SMTP id z37mr12406128plh.265.1497989549574; Tue, 20 Jun 2017 13:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497989549; cv=none; d=google.com; s=arc-20160816; b=BZ4jx9wkD4fVtNDkQh7zRP0lxgMtR0e3ja49DWDV0DRnERTMk/mnizL2q4fomba6Xw ckrzq3X63zPXRzffuy2t1upyzSC/2Lv8RozC6JbxmmWrl69AbHUSzLJV/PStI3Waw+C2 NAuVfGrMWCHBtJEUBALJfFnLardwuk1ut3FWzMBg/DVJt9eYrqxGbUJw5Wsv15S/UcC+ JUU6nAAzLwj7nOwmEIdit95jfklqJtjfB+5qIoDb6fPo0o/ds0paq/fO+5xZbwBmUgJe GYxTuwovg6wImyt1M/hsPS/K2xJTpKYRLdNxTe12UqDfYWf9Fmq1N33BR5WVCLBKh4rh Zsbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=3R6sMpVXT0Ug8Lwl0jBoaAo/fd13qWtA+HjynM7dNpo=; b=BS1w0bV8ZKc3W7WN9ztjdEGZ64LxDXcdbPo8xiakGTagnnJF8jyxDvJ9qzHGDYn14w hua0PeBsAnYGJaKk1Qbts1eKHn5ZOgZ8PmtPckvy5tdmAIALQGQv1F+aKN4tZyWXbQnm ZKz6lhf1iABls8kxGMFA+LxFj1C/NGDVC78roqk33szZ4tpffGBUJCL9Dx0fXwbtew68 LBOtM0v1V6JpAdhZzqhHDwZC1cssYGbTf6jVbkm1yPW439efCvIrCP5v2j0fbzVatPYU AN+ClrGqCiT1QBsIxZnr1WBeJvEd9KeOwxn55Uudt1gYnOgJ5dg7AuHY44mITxOLAp90 Qs9Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t189si11137535pfd.421.2017.06.20.13.12.29; Tue, 20 Jun 2017 13:12:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752106AbdFTUM1 (ORCPT + 25 others); Tue, 20 Jun 2017 16:12:27 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:65092 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbdFTUMZ (ORCPT ); Tue, 20 Jun 2017 16:12:25 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MN4ps-1dPdUR0DSS-006bnO; Tue, 20 Jun 2017 22:12:11 +0200 From: Arnd Bergmann To: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Cc: Arnd Bergmann , Ivan Delalande , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next PATCH] tcp: md5: hide unused variable Date: Tue, 20 Jun 2017 22:11:21 +0200 Message-Id: <20170620201203.121119-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:gfZ5o8RcuXAkMU8xEDt9OyluxspsuwsK0bEEsIttnwSq6NjVjLl 3BugwaDzSNkZuKBJ7lZ8v0x7fuomYxtEG/W8/qU/P1dQ4bWpUFBwy8H1qpVVEFoR2vkouqB /1F4syB/fUpj2zAeSxbW5wnYsWGPaRQN44Oc+xv4uF75XwuPG7Cy7lW1z9uAFyx1LsZv7yZ iY/F/R8lL+TBHmeJtRIUw== X-UI-Out-Filterresults: notjunk:1; V01:K0:1VO/atqaerk=:aAziWxuDCwWjaBqxYPyuXr YSo1zzBzj60Mg3vb98C1//otjXJs5RTMUvJd55VpWHeLt2kfbQA42A5v1gSswf7+lrtmfuuD3 Cga0zTplKI6tRzow2ptAsotaDRty4o2gkTjQkmHeAZIMTU2tU82FoOZYda6jPnZdyT8SasN/b JPNJgpJK/l0ptmFVkK3WLwkYRsCYfJr3Bzn6g1mdP8nTja3e82ON0H/jSwLoqA8A17/D32h39 QxwWe8vqxX+uFs09GfON0m041lgCWpL45DFkl9m8CKisS6Uf8UAfUt0qSNV/yFjzFn6ibcRTJ rym9FCiAqETmNIBKg4JRehFPAOEKUjR4LqAbj5zJR7a2M/IUEl5Lbr3HmdfCFEdlViWcbPrMh bIqGLgrqsXl4LJ6A2X29tBERXzznPtJlMXDn37oaQhEXMglLEQnt6G92fDRbCbtis9SFvKs8c nJrAuGQJInA1BFO97RZ9aBzvqUEIILZKT3PP9WvX/rF4+OKzLODz6wYF3Nd+UPisol+ttP2nq tIysMhv1VV7c4dqy7B5pejqOIYLmeVQCQV1/2MLDLgZJ6unNJn6HdtSa3SMQ1VP+N8Nw5vHYF BV6n1Ds5Y/g1t8usL9k9jMiEcJVE/dv64OVh6f3bKUMHjqgDho6PLxlwPpyIYYEcoZhj5vkVy P5kMNzNqMil91PXgTBWBtgBzquuFnC7LgJfoKVE/7BN+cB13Na/9aIysg5EQWgGGcblI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changing from a memcpy to per-member comparison left the size variable unused: net/ipv4/tcp_ipv4.c: In function 'tcp_md5_do_lookup': net/ipv4/tcp_ipv4.c:910:15: error: unused variable 'size' [-Werror=unused-variable] This does not show up when CONFIG_IPV6 is enabled, but the variable can be removed either way, along with the now unused assignment. Fixes: 6797318e623d ("tcp: md5: add an address prefix for key lookup") Signed-off-by: Arnd Bergmann --- net/ipv4/tcp_ipv4.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.9.0 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index bf407f3e20dd..e20bcf0061af 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -907,7 +907,6 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk, { const struct tcp_sock *tp = tcp_sk(sk); struct tcp_md5sig_key *key; - unsigned int size = sizeof(struct in_addr); const struct tcp_md5sig_info *md5sig; __be32 mask; struct tcp_md5sig_key *best_match = NULL; @@ -918,10 +917,7 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk, lockdep_sock_is_held(sk)); if (!md5sig) return NULL; -#if IS_ENABLED(CONFIG_IPV6) - if (family == AF_INET6) - size = sizeof(struct in6_addr); -#endif + hlist_for_each_entry_rcu(key, &md5sig->head, node) { if (key->family != family) continue;