From patchwork Fri Jul 28 14:40:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 794941 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="AJ4EVVED"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xJs5J1F5jz9s5L for ; Sat, 29 Jul 2017 00:42:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752129AbdG1Omm (ORCPT ); Fri, 28 Jul 2017 10:42:42 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34204 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbdG1OlO (ORCPT ); Fri, 28 Jul 2017 10:41:14 -0400 Received: by mail-wr0-f196.google.com with SMTP id o33so19221319wrb.1 for ; Fri, 28 Jul 2017 07:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zPw4zlKQh2FiZ3cGxMblDc19rKT6oQJ6wMxapWq6zOg=; b=AJ4EVVEDq1IbCnTMXjpZv2WneWE0JT53tUIs1Y+MkFtYqPepklscIRXCQd7K5iBtH0 xo3l8+wEoPYtM6Vs2WAQ/yqtT3jtUcjh9OXvgUsMk82WRScVpE/y5KanO3znHkT7iyY2 drr/0z1L5RcPT5EedRLNavoPoIgpXayMi/2hoGFKhDPw+nizvSqYGcfNLSGuyzAo5tc4 nmZHc9vr65BnD6515mieNJd2+ZO8rj7aZp6EFtpLqoKeNOeJZq2CW96n0aE/pGRY2gAJ SCYVWp4S92e8/IgO9GZVn3VRjgtpf585RoFxnCUGgcI52Dk+hYVpfiyXTg6FBReQmify G/MQ== 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=zPw4zlKQh2FiZ3cGxMblDc19rKT6oQJ6wMxapWq6zOg=; b=WjMcE467xpKwapqoE/3vc2EcN0L9H0hVCsMKEfVF2/Y3tZMUq3Yiatf2H/oqqV6y0l SFH86Zl17kz0NOaFw+DGwaKhn3EbAiHoUmTMO/j0lOqnO7ZUPzn0I7Hv2dG66XXVeOKx WzTX9awvGHnQPcBF8iI/tUsurk0CzifhUfJx94X4UKav5LDor/Yb0SoXt/ZQ5rnyr0CN /q9ywvQz9NpNtft9tooVGDem/QlYqqwaVcNiNGDd+GQvOk9WFli4kGAQc93059CZtazq sQHOiXfqcrrllXR3dvbD2UGHZiEYN3yLDbpm7BIkMHksKaRdzyLXOP4cQJqJAvmio6Ey RA7g== X-Gm-Message-State: AIVw112hqOUKY6MLMU6SHsyL2Py4rFyRo3Cx7dfYus3NldYAeElPciEz Nx9jbwl+9opBQx4R10M= X-Received: by 10.223.175.5 with SMTP id z5mr5992963wrc.11.1501252873350; Fri, 28 Jul 2017 07:41:13 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id k201sm11642064wmg.11.2017.07.28.07.41.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Jul 2017 07:41:12 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, daniel@iogearbox.net, mlxsw@mellanox.com Subject: [patch net-next 08/20] net: sched: use tcf_exts_has_actions instead of exts->nr_actions Date: Fri, 28 Jul 2017 16:40:30 +0200 Message-Id: <20170728144042.6380-9-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170728144042.6380-1-jiri@resnulli.us> References: <20170728144042.6380-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko For check in tcf_exts_dump use tcf_exts_has_actions helper instead of exts->nr_actions for checking if there are any actions present. Signed-off-by: Jiri Pirko --- net/sched/cls_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 287ae6c..735d556 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -915,7 +915,7 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts) #ifdef CONFIG_NET_CLS_ACT struct nlattr *nest; - if (exts->action && exts->nr_actions) { + if (exts->action && tcf_exts_has_actions(exts)) { /* * again for backward compatible mode - we want * to work with both old and new modes of entering