projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c97bc0
)
net/ncsi: use proper "mellanox" DT vendor prefix
author
Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org>
Wed, 22 Jun 2022 11:54:16 +0000
(13:54 +0200)
committer
Jakub Kicinski
<kuba@kernel.org>
Fri, 24 Jun 2022 03:51:06 +0000
(20:51 -0700)
"mlx" Devicetree vendor prefix is not documented and instead "mellanox"
should be used.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link:
https://lore.kernel.org/r/20220622115416.7400-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ncsi/ncsi-manage.c
patch
|
blob
|
history
diff --git
a/net/ncsi/ncsi-manage.c
b/net/ncsi/ncsi-manage.c
index 78814417d753fc99950a0ca3d5e0a6310c4aff36..80713febfac6dd1911f83d05eb649888dcb93514 100644
(file)
--- 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;
}