From patchwork Fri Mar 11 09:08:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 596105 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 288BA1402A1 for ; Fri, 11 Mar 2016 20:05:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980AbcCKJFO (ORCPT ); Fri, 11 Mar 2016 04:05:14 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33203 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752928AbcCKJFK (ORCPT ); Fri, 11 Mar 2016 04:05:10 -0500 Received: by mail-wm0-f66.google.com with SMTP id n186so1175147wmn.0 for ; Fri, 11 Mar 2016 01:05:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KgYyjuarmznXufVi0KF3Nth14ok4cCR8++wRRm5CbwY=; b=aknykvC5Ox73NPf2owsV2Xyb1J1anlsOpV0VvxzGmnfrPj4xy3/aglgDsLvF1pMV3z ZoUMy7+Ff5KOlIJPyDz9mIPt0cdB9ZXZ6kXHslrnVd3saEFKJeojxIC7lSLaFhb+2uEk Ga6lWFSWyBp+UqPETi/0mjC1J/QgkGJ24BKTRRjHZRWTZneJOpmpfYre85RADJ3JO56o 11d9gk2xjwQ3Dfk8XnEwjjewSqnftCyqR3OphuK+1UUfE3SryLYC8GWAuD64PRFNMHjy XMKIx2+o1iS6Or7XKDOAoPqnmi3fSYT2VvMyzuhASfe/bLNa0o/7VzY+nNukTxYoYqUv Vg0g== X-Gm-Message-State: AD7BkJK9rIOOWZxywelbZUPKJYr1tCtgN4TuEg6c7tXf8jr7OlklwtaJ3xDia7yX4E7kqA== X-Received: by 10.194.171.66 with SMTP id as2mr8509219wjc.110.1457687109505; Fri, 11 Mar 2016 01:05:09 -0800 (PST) Received: from office.mtl.com? (212.116.172.4.static.012.net.il. [212.116.172.4]) by smtp.gmail.com with ESMTPSA id z6sm1256953wme.9.2016.03.11.01.05.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Mar 2016 01:05:08 -0800 (PST) From: Amir Vadai To: "David S. Miller" Cc: netdev@vger.kernel.org, Or Gerlitz , Amir Vadai Subject: [PATCH net-next] net/flower: Fix pointer cast Date: Fri, 11 Mar 2016 11:08:45 +0200 Message-Id: <1457687325-11214-1-git-send-email-amir@vadai.me> X-Mailer: git-send-email 2.7.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cast pointer to unsigned long instead of u64, to fix compilation warning on 32 bit arch, spotted by 0day build. Fixes: 5b33f48 ("net/flower: Introduce hardware offload support") Signed-off-by: Amir Vadai --- include/net/pkt_cls.h | 2 +- net/sched/cls_flower.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 5b4e8f0..caa5e18 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -416,7 +416,7 @@ enum tc_fl_command { struct tc_cls_flower_offload { enum tc_fl_command command; - u64 cookie; + unsigned long cookie; struct flow_dissector *dissector; struct fl_flow_key *mask; struct fl_flow_key *key; diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 25d8766..2181ffc 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -165,7 +165,7 @@ static void fl_destroy_filter(struct rcu_head *head) kfree(f); } -static void fl_hw_destroy_filter(struct tcf_proto *tp, u64 cookie) +static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie) { struct net_device *dev = tp->q->dev_queue->dev; struct tc_cls_flower_offload offload = {0}; @@ -188,7 +188,7 @@ static void fl_hw_replace_filter(struct tcf_proto *tp, struct fl_flow_key *mask, struct fl_flow_key *key, struct tcf_exts *actions, - u64 cookie, u32 flags) + unsigned long cookie, u32 flags) { struct net_device *dev = tp->q->dev_queue->dev; struct tc_cls_flower_offload offload = {0}; @@ -219,7 +219,7 @@ static bool fl_destroy(struct tcf_proto *tp, bool force) return false; list_for_each_entry_safe(f, next, &head->filters, list) { - fl_hw_destroy_filter(tp, (u64)f); + fl_hw_destroy_filter(tp, (unsigned long)f); list_del_rcu(&f->list); call_rcu(&f->rcu, fl_destroy_filter); } @@ -554,13 +554,13 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, &mask.key, &fnew->key, &fnew->exts, - (u64)fnew, + (unsigned long)fnew, flags); if (fold) { rhashtable_remove_fast(&head->ht, &fold->ht_node, head->ht_params); - fl_hw_destroy_filter(tp, (u64)fold); + fl_hw_destroy_filter(tp, (unsigned long)fold); } *arg = (unsigned long) fnew; @@ -588,7 +588,7 @@ static int fl_delete(struct tcf_proto *tp, unsigned long arg) rhashtable_remove_fast(&head->ht, &f->ht_node, head->ht_params); list_del_rcu(&f->list); - fl_hw_destroy_filter(tp, (u64)f); + fl_hw_destroy_filter(tp, (unsigned long)f); tcf_unbind_filter(tp, &f->res); call_rcu(&f->rcu, fl_destroy_filter); return 0;