From patchwork Fri Dec 22 15:52:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 852432 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=gmail.com header.i=@gmail.com header.b="hlA5OkJA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z3Ch86ZCcz9s4s for ; Sat, 23 Dec 2017 02:52:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756158AbdLVPw0 (ORCPT ); Fri, 22 Dec 2017 10:52:26 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34626 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752039AbdLVPwZ (ORCPT ); Fri, 22 Dec 2017 10:52:25 -0500 Received: by mail-wr0-f194.google.com with SMTP id y21so28287174wrc.1; Fri, 22 Dec 2017 07:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IkGVvYCi8Ag4kqt9tz4dZlMuUbEAyASU+ShXKiauxyg=; b=hlA5OkJAWojL57hSLgqJtsKL8W34K3LZ3XCnv7RKrMVNi3AS5UHOqP/pUxUquGaTmg yb9EAgznD8DUZrm0p6cpr2/VzNB0aZNJ2XsBZvqu7c//TRq8n1YB9VMVxyThPrq+Vynu Mh6CxIiZzxltLu7bjNXUcMPC4JZlBAo39f1Y6i84nSQ+G7+9xw+LZ6fdFpE0Jj+H/UXo WKeUAhqq1czbdsPuQw2AAndGKsHGoplzDTJyeAwddHo8kFqW1wG4tTpRdgU0RTlmeKX5 fBbbtCFpO4Y7o7MPEKVw8+91ZWcDoYUcHTLeamo827BqHw0SJyJuO9EeOzyeRLcc+aTC IF/A== 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; bh=IkGVvYCi8Ag4kqt9tz4dZlMuUbEAyASU+ShXKiauxyg=; b=qOpACJ8f5fdu+IxBtwT91H8EpldPYMFWMI56gnv5iMcOdj3GF22h4CB2Zciccx7IYw Mv9knVQsw+J7C3hc1aTAV+B3g4z1utXLHiCWJLp1JdY+BowT3nibxnoMr0cqfu6M9Vi4 XCGS1D/ltIcuKxDbIqYo/U+ehjT81GKos85CiWMXTX270h631tnaq3YTpvTBLPkdkIwA V054hE6T4lIITEg+7IJ9VHCeGKdH2dZ7DCSBm482MUQqi0t87gQnua/afuppMXdlSpXr /WcY+ydZISvLXXLU4lZsSi3klER9YkvIVWI31VYKLPteWKuezJCkujQdqSm1BxknoWyx aylw== X-Gm-Message-State: AKGB3mK+Stt/IWIRy0G+LyjDuV0QiGf/CgvpjzwXrjEe8KJUpPW+Dljn L1Rx1pkWEYQY4+c0pPT1KrKzdebm X-Google-Smtp-Source: ACJfBosfZthf1+i05PCPZYirTVrQYhzyiFSPd7/dOWbEDSG1aSRlRDFGSZ8EWswQwBZHME10VjsQLQ== X-Received: by 10.223.166.205 with SMTP id t71mr15325614wrc.64.1513957944112; Fri, 22 Dec 2017 07:52:24 -0800 (PST) Received: from localhost.localdomain (cpc101300-bagu16-2-0-cust362.1-3.cable.virginm.net. [86.21.41.107]) by smtp.gmail.com with ESMTPSA id k25sm20423552wrk.11.2017.12.22.07.52.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Dec 2017 07:52:23 -0800 (PST) From: Sudip Mukherjee To: Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Sudip Mukherjee Subject: [PATCH] net: sch: api: fix tcf_block_get Date: Fri, 22 Dec 2017 15:52:05 +0000 Message-Id: <1513957925-2544-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The build of mips bcm47xx_defconfig is failing with the error: net/sched/sch_fq_codel.c: In function 'fq_codel_init': net/sched/sch_fq_codel.c:487:8: error: too many arguments to function 'tcf_block_get' While adding the extack support, the commit missed adding it in the headers when CONFIG_NET_CLS is not defined. Fixes: 8d1a77f974ca ("net: sch: api: add extack support in tcf_block_get") Signed-off-by: Sudip Mukherjee --- The build log of next-20171222 is at: https://travis-ci.org/sudipm-mukherjee/parport/jobs/320089922 include/net/pkt_cls.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 31574c9..5cd3cf5 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -79,7 +79,8 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, #else static inline int tcf_block_get(struct tcf_block **p_block, - struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q) + struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q, + struct netlink_ext_ack *extack) { return 0; }