Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1380611 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2016-04-16 22:30 +0200 |
| Last post | 2016-04-16 23:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] devlink: fix devlink_sb_register prototype Arnd Bergmann <arnd@arndb.de> - 2016-04-16 22:30 +0200
Re: [PATCH] devlink: fix devlink_sb_register prototype Jiri Pirko <jiri@resnulli.us> - 2016-04-16 23:10 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-04-16 22:30 +0200 |
| Subject | [PATCH] devlink: fix devlink_sb_register prototype |
| Message-ID | <roF0R-Ro-3@gated-at.bofh.it> |
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 <arnd@arndb.de>
Fixes: bf7974710a40 ("devlink: add shared buffer configuration")
---
include/net/devlink.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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;
}
--
2.7.0
[toc] | [next] | [standalone]
| From | Jiri Pirko <jiri@resnulli.us> |
|---|---|
| Date | 2016-04-16 23:10 +0200 |
| Message-ID | <roFDz-1ov-3@gated-at.bofh.it> |
| In reply to | #1380611 |
Sat, Apr 16, 2016 at 10:27:06PM CEST, arnd@arndb.de wrote:
>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 <arnd@arndb.de>
>Fixes: bf7974710a40 ("devlink: add shared buffer configuration")
Already fixed by:
commit de33efd0fb7f923cd41671b1f743c3a0d44dd953
Author: Jiri Pirko <jiri@mellanox.com>
Date: Fri Apr 15 09:17:08 2016 +0200
devlink: fix sb register stub in case devlink is disabled
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web