From patchwork Mon Oct 8 10:22:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 980472 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=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="rgfhvaah"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TGf72vx1z9sD2 for ; Mon, 8 Oct 2018 21:23:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727579AbeJHReJ (ORCPT ); Mon, 8 Oct 2018 13:34:09 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:38046 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727427AbeJHReJ (ORCPT ); Mon, 8 Oct 2018 13:34:09 -0400 Received: by mail-it1-f196.google.com with SMTP id i76-v6so11129694ita.3 for ; Mon, 08 Oct 2018 03:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8UC1Kgf9qA/QOHP7F6iVDMxE1J1nvyAyhv2ZoIq0ZUg=; b=rgfhvaahlZy4nIfRWW6gpe9wVexnLVEA058Va02Z4JZqVJrywNikgDbOjrHsNsSSES u/cMMhJNaoEb7JrCkuFywIc8vLj1uGCPcHa7IOh5/b2IOLoF1n1xFEcm9AOoKckq2pcj z+lWyxhu2KlCDJgQCqfqRWTX+tfYOY5/JtgFYp9gt74EDVMpAHMmHABkb5U2D8F+pnj6 kUZt7r7Gi3gcj5+CJbxPjE3o3r+q6CahASbFWRIv264xe0oDxRTKtQMEQwnZ+gixa/QB RMUdJpP19pgB5QPg0Aicgl77+Sn/vSC79mOU7eOmGz/W/XD1vboqrSmMAlLGSsNlPMMM ATQg== 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=8UC1Kgf9qA/QOHP7F6iVDMxE1J1nvyAyhv2ZoIq0ZUg=; b=hTE73/CvsRg7bzp/a6AYIrJdpc5KKdvpL86IDO/w5i0UBxFZC/9yXYf185BLQPNxvy A2anrIjjTksU13V62+IQQIOSniSxmlh74wUKkhi1kQD++U5uGtisl4P+3tinfNdO3ek6 kLPDasfMreUY/C/3Gize9usXmbF2PUt8gyFYLU89iyoh+8s4nFqN93R7rjtpwr20rO5q IrzGI+QVbyy+WzV1TmJ4USHWClYrMAkYIL5/srCAFEe6uwzZPGmnRq+kqTvEl9RLNbbY Th9hjwK6ucgxCRsB81kvb7KThtNKleL6QTTZf4zK4oEzBgwD8tw049nYbP/QyEwfY5Ix lFXQ== X-Gm-Message-State: ABuFfoi6IjNAcYhv3hKCcazoEbOzMPkbOhN2s7yYDvHbVsgj1+Ntidk6 Cdce32i1Y2qtW2DG4DBFq33FA9VgdD4= X-Google-Smtp-Source: ACcGV62ZAFkign3FWlr1tcXOso/gn5L4eoeLuAFxyc7tD15n7PpQ1m27WQje2nlQpSm6PQ4bT4GnpA== X-Received: by 2002:a24:68f:: with SMTP id 137-v6mr11926179itv.54.1538994188861; Mon, 08 Oct 2018 03:23:08 -0700 (PDT) Received: from localhost.localdomain (198-84-205-232.cpe.teksavvy.com. [198.84.205.232]) by smtp.gmail.com with ESMTPSA id q5-v6sm5184418iog.8.2018.10.08.03.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 03:23:08 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, viro@zeniv.linux.org.uk, Jamal Hadi Salim Subject: [PATCH net-next v2 04/12] net: sched: cls_u32: get rid of unused argument of u32_destroy_key() Date: Mon, 8 Oct 2018 06:22:36 -0400 Message-Id: <20181008102244.22212-5-jhs@emojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181008102244.22212-1-jhs@emojatatu.com> References: <20181008102244.22212-1-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Al Viro Signed-off-by: Al Viro Signed-off-by: Jamal Hadi Salim --- net/sched/cls_u32.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index ce55eea448a0..ef0f2e6ec422 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -405,8 +405,7 @@ static int u32_init(struct tcf_proto *tp) return 0; } -static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n, - bool free_pf) +static int u32_destroy_key(struct tc_u_knode *n, bool free_pf) { struct tc_u_hnode *ht = rtnl_dereference(n->ht_down); @@ -440,7 +439,7 @@ static void u32_delete_key_work(struct work_struct *work) struct tc_u_knode, rwork); rtnl_lock(); - u32_destroy_key(key->tp, key, false); + u32_destroy_key(key, false); rtnl_unlock(); } @@ -457,7 +456,7 @@ static void u32_delete_key_freepf_work(struct work_struct *work) struct tc_u_knode, rwork); rtnl_lock(); - u32_destroy_key(key->tp, key, true); + u32_destroy_key(key, true); rtnl_unlock(); } @@ -600,7 +599,7 @@ static void u32_clear_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht, if (tcf_exts_get_net(&n->exts)) tcf_queue_work(&n->rwork, u32_delete_key_freepf_work); else - u32_destroy_key(n->tp, n, true); + u32_destroy_key(n, true); } } } @@ -971,13 +970,13 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, tca[TCA_RATE], ovr, extack); if (err) { - u32_destroy_key(tp, new, false); + u32_destroy_key(new, false); return err; } err = u32_replace_hw_knode(tp, new, flags, extack); if (err) { - u32_destroy_key(tp, new, false); + u32_destroy_key(new, false); return err; }