From patchwork Sat Apr 16 20:27:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102507 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp569938qge; Sat, 16 Apr 2016 13:27:40 -0700 (PDT) X-Received: by 10.66.180.68 with SMTP id dm4mr22183264pac.76.1460838460759; Sat, 16 Apr 2016 13:27:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id da6si5526976pad.156.2016.04.16.13.27.40; Sat, 16 Apr 2016 13:27:40 -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 S1752073AbcDPU1j (ORCPT + 29 others); Sat, 16 Apr 2016 16:27:39 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:56069 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbcDPU1h (ORCPT ); Sat, 16 Apr 2016 16:27:37 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lw1TZ-1bqECT3AvV-017ouf; Sat, 16 Apr 2016 22:27:28 +0200 From: Arnd Bergmann To: Jiri Pirko , "David S. Miller" Cc: Arnd Bergmann , Ido Schimmel , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] devlink: fix devlink_sb_register prototype Date: Sat, 16 Apr 2016 22:27:06 +0200 Message-Id: <1460838446-1246570-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:/g7/r/52Kkw9SEwbSsgAx99fnIqWJQ1qW8IQqpfqVuNH+fJvjFO /NwRZy/vhJ9h3t9XDTU4cYkvfl358MHsvZXd+tyuCU2ed0AiX0OwNkxTrJzYlHbRzDBeomY 1vWHPULSzZMJuhvVFfF+Tn0jOIkSdfNLqkjxoul86zoMdOiVNIaArSWlwMhZyRC0WN+PZUD 5yzVhOFeCWxTx9BgR2e9A== X-UI-Out-Filterresults: notjunk:1; V01:K0:MAkUBlyianQ=:AepaBwSohoCW4mmWKeTVG8 mATCgGXkCg5LaVz5Gb2euGiwoFnHvhKBe2ctQ4rtNuUq2Si8GDpaElyqT/OV/ael6LrQM+QfT 880JDc3/aIcS/rcprvGKquNVB3WZmFF5k5xsb6HFTqPEsuRWaU60OEZQw4XsnP2CKCtDTFjWW x+Hs0a2Z9EEtxQPmTG6FmoBo6Yhz8bCttXvsZx8n0631foN5hWFmcnw/QlImc7BODRJW4QP7O KFuubrLLUn6oJf4TdyFFxR4mLwtUODHpjHaG8cg4ucX2jnu93IkofQ4I6WKfhen/ej7LkgXFz N70/3vVhp302b1nNgrevo+jC/UZ70KO4bXmAkUEL1mnqRP1TCe6EN5Fgfo6w5Il0m5aJBl0bC zqGHwwy38KSanehzGPPZMKZCaIQ84ZZO/TPyG8ZYI+l9qblfuxjfpavUdN5Ztkvs3FngD357Q 40FD6GJeUDkosKVLGgVgFSEQAeFWP5/8in3sbrNWoCLK5RGHw3+LgPTBwCSF0fTcIB0HPdE8C f0CDd1f+YwZFAX9/JumR5+2tMprcTJYmodkdRdPSkelyCbCaIIAlh4giv1EVybaSDfljo9Z8R k11QlY9SmiXy/7KsbbkLTHY9srB+msU5KAJjd79yKFAvVI/lEGi9cUiq9HQt16n2NRJjVwp+p YJ+n9QvD51HCinyRD7kSLKrbH3611+qgTQSxaQCR2ssL2T3YP5ntDIgQf4U6ufEybYyc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The devlink shared buffer interface contains two different prototypes for devlink_sb_register, and the one that is used when NET_DEVLINK is disabled does not work: drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c: In function 'mlxsw_sp_buffers_init': drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c:547:9: error: too many arguments to function 'devlink_sb_register' return devlink_sb_register(priv_to_devlink(mlxsw_sp->core), 0, This makes the two prototypes have the same argument list. Signed-off-by: Arnd Bergmann Fixes: bf7974710a40 ("devlink: add shared buffer configuration") --- include/net/devlink.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.0 diff --git a/include/net/devlink.h b/include/net/devlink.h index be64218e0254..1d45b61cb320 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -184,7 +184,9 @@ static inline void devlink_port_split_set(struct devlink_port *devlink_port, static inline int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, u32 size, u16 ingress_pools_count, - u16 egress_pools_count, u16 tc_count) + u16 egress_pools_count, + u16 ingress_tc_count, + u16 egress_tc_count) { return 0; }