From: Jiri Pirko Date: Wed, 3 Apr 2019 12:24:23 +0000 (+0200) Subject: nfp: pass switch ID through devlink_port_attrs_set() X-Git-Tag: v5.2-rc1~133^2~238^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b15c90270c5051799fe5a557684d66dbc95d7b4;p=thirdparty%2Fkernel%2Flinux.git nfp: pass switch ID through devlink_port_attrs_set() Pass the switch ID down the to devlink through devlink_port_attrs_set() so it can be used by devlink_compat_switch_id_get(). Signed-off-by: Jiri Pirko Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 15c4d2e0c86eb..8e7591241e7ca 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -354,6 +354,8 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) { struct nfp_eth_table_port eth_port; struct devlink *devlink; + const u8 *serial; + int serial_len; int ret; rtnl_lock(); @@ -362,9 +364,10 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) if (ret) return ret; + serial_len = nfp_cpp_serial(port->app->cpp, &serial); devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, eth_port.label_port, eth_port.is_split, - eth_port.label_subport, NULL, 0); + eth_port.label_subport, serial, serial_len); devlink = priv_to_devlink(app->pf);