From patchwork Wed Oct 18 08:33:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 116241 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp2119972edb; Wed, 18 Oct 2017 01:34:21 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCkapXJUSj1bEsoJUpgSZ4muInNrUJNu0ofBGa+cjcS2djZEPP91Qx9CLK1E1vb/1Aq7T2h X-Received: by 10.98.33.80 with SMTP id h77mr14342855pfh.18.1508315661051; Wed, 18 Oct 2017 01:34:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508315661; cv=none; d=google.com; s=arc-20160816; b=MFeiGJfSCUsOQ+d3EUDXDQCEcnKF5SUdHlhhKOO8xJHYDSsu6d28SfBosV7NUH+gYn xZmk54EMWgjm5sRIEkQs0PTkLIvbww49LrG0M9iTETkfFIOVkIppj5SLedJXQeThFe9H mIa3qBPceQH+KqpTIVUtyr35yB5+eDWEL9dc1Iz8llaaEQ7Dqp8Bjk53E1USXbBEhPQH 6hGgQuqD/gGt6vVb7qWl7V0RPGBTQ52rT5WngXAEQuyD3iG7u9hFEInGgIiXu7KBTpE5 XW4tSF6D6ZySBcSXSW5+EdpFugNis10eGaIzt14ObPL2bh/J7qi1N9ahwbuUYCUTbUGL VVAQ== 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=BCv/MnTPdYlHmMd+tOHCqhtpupmJ64HwiU+gORWVfvM=; b=gwNmUXxK6WciqryXikStTr5bdNYNaiyaGAi4BOH/j3pbTjb5bgPKXH38ebnMncTNRV ldrRRZ+Vz1NJNWB1OMDl3YvGiHCZxUB/SDRq9x6r1LMSdBbEbSCSv5I3JII35KY+H338 waPGvPJR6RurI6rNlbVrzaonW0QvFuOvcd5cpDQd4eP8Dj/I/UByULmPOCowJl+d+pK5 mXiwfl4k2tuxC5eTbFxXOVVHy+FKovBeInM57RuI6JTe2KQcEwTXpQwAz5S+rP6iRVRc DnAzRqQnVX3AAagwFtQI3NfrAsqK/1YNxJbAhZMhL8HOkgK7vKBjjqz2bc/rQDjGlpjb 1Pkg== 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 k6si6558319pgt.280.2017.10.18.01.34.20; Wed, 18 Oct 2017 01:34:21 -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 S936314AbdJRIeR (ORCPT + 27 others); Wed, 18 Oct 2017 04:34:17 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:60897 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753474AbdJRIeO (ORCPT ); Wed, 18 Oct 2017 04:34:14 -0400 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MXH2D-1dhS8o03ID-00WChW; Wed, 18 Oct 2017 10:34:07 +0200 From: Arnd Bergmann To: Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: sched: cls_u32: use hash_ptr() for tc_u_hash Date: Wed, 18 Oct 2017 10:33:37 +0200 Message-Id: <20171018083403.3236142-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Vzmz2IukmsDdtqGojyG9yErWa2gYPM4Yvl+rJkJD5p5eIvDb7/5 Mv5t5pb0OjXldOrruHYilXqGPMd7wkUxdjdljfYnQFyWXlf85+Dx7lKHLcL07jJW2imIUEn YWOQ2q7n0diOhDyglb+sBJ8JJCrKYYVPBLUOtIpk5ZgGoTispG8udo+4A1oASiUFdMoB3v8 UGMZ+zCMAo7w1cLPDA7NQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:vrI/25Sibzo=:I5edwT5uOZugfyPiEX4RzL Xgqvaz/d9krKAmbytivpLvtz5v7DT8N6iGFQoC0nQTvhmke6I1qDOJ0aRhB3YAHFd7hG/SZsn OQiHBUevZqUPESLZVDAg3+gSrlf1xoLTr6GjdJsWKleiotRu9T4/tHUvXm/hJl6EJk4ukLUOI k6iT7pAaY/FxwpaTMCmt2AB4j3PJ4eBZ4KbXaj16+nP5zUEPHUUq6HX2sUl98Nwp5ZQb0RamP RLJWFa4zr7Kg43C9kNpjk6rRVUS3D3QgOS4kjZnGgbasqz7l44OsQvPUO6cKPvNrjyn4fsNOJ wAVTTm1T/MGeBZusxz6EHu2XzoRYB2H12g4BIsUOyj+gsKQNjyH65oF1muAPHpTr1Do0YTJ8K 9fg+rSqioEITSY3o/elC++YpsC/BJcnTfDVH/1A30OW3dFrg/dDS1jlelcoudy0v1QOk8hpe6 iupOnBRFbcMPkwqzPmjc8BOOAUD0CJSKaLA15TtwOVa4404ObggBMh+zORiVtOlaFeSIDSPal qkbrTOCe7OHtSuXqtwCUnhypG8GP+FUNSssd1LVpac0h2pLos/qPpxa8uDq2r6t/43zkKj6+M ZoaRvixj4y8z7XyPFphYEg/6UWCmGeToBu/0vNZRfK4WN/dWcMg5vSFFrCUour8wPNgivyQ8R QvZFy+cc+0J7l0NQWjl4yv2JiwZnBQeHcvn1xUMCAb0gCmxEN3T+yhLTCPN18EQ97U60Czj+i OKxiTZw1OMslReUv4SQub5YJJbsFZRLQfXCZqQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After the change to the tp hash, we now get a build warning on 32-bit architectures: net/sched/cls_u32.c: In function 'tc_u_hash': net/sched/cls_u32.c:338:17: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] return hash_64((u64) tp->chain->block, U32_HASH_SHIFT); Using hash_ptr() instead of hash_64() lets us drop the cast and fixes the warning while still resulting in the same hash value. Fixes: 7fa9d974f3c2 ("net: sched: cls_u32: use block instead of q in tc_u_common") Signed-off-by: Arnd Bergmann --- net/sched/cls_u32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Acked-by: Jiri Pirko diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index b6d46065f661..49d96b45a8ce 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -335,7 +335,7 @@ static struct hlist_head *tc_u_common_hash; static unsigned int tc_u_hash(const struct tcf_proto *tp) { - return hash_64((u64) tp->chain->block, U32_HASH_SHIFT); + return hash_ptr(tp->chain->block, U32_HASH_SHIFT); } static struct tc_u_common *tc_u_common_find(const struct tcf_proto *tp)