| Message ID | 20220622115416.7400-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ad887a507d7386de09a532c5d303ed659eba2cfb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [RESEND] net/ncsi: use proper "mellanox" DT vendor prefix | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 22 Jun 2022 13:54:16 +0200 you wrote: > "mlx" Devicetree vendor prefix is not documented and instead "mellanox" > should be used. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > [...] Here is the summary with links: - [RESEND] net/ncsi: use proper "mellanox" DT vendor prefix https://git.kernel.org/netdev/net/c/ad887a507d73 You are awesome, thank you!
diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 78814417d753..80713febfac6 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -1803,7 +1803,8 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev, pdev = to_platform_device(dev->dev.parent); if (pdev) { np = pdev->dev.of_node; - if (np && of_get_property(np, "mlx,multi-host", NULL)) + if (np && (of_get_property(np, "mellanox,multi-host", NULL) || + of_get_property(np, "mlx,multi-host", NULL))) ndp->mlx_multi_host = true; }
"mlx" Devicetree vendor prefix is not documented and instead "mellanox" should be used. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Reason for resend: split from DTS patch. The patch is safe to take independently. --- net/ncsi/ncsi-manage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)