diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 48eda16db1a7..9b5e11d3fb85 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
@@ -2402,7 +2402,18 @@ static ssize_t dev_id_show(struct device *dev, | |||
2402 | { | 2402 | { |
2403 | struct net_device *ndev = to_net_dev(dev); | 2403 | struct net_device *ndev = to_net_dev(dev); |
2404 | 2404 | ||
2405 | if (ndev->dev_id == ndev->dev_port) | 2405 | /* |
2406 | * ndev->dev_port will be equal to 0 in old kernel prior to commit | ||
2407 | * 9b8b2a323008 ("IB/ipoib: Use dev_port to expose network interface | ||
2408 | * port numbers") Zero was chosen as special case for user space | ||
2409 | * applications to fallback and query dev_id to check if it has | ||
2410 | * different value or not. | ||
2411 | * | ||
2412 | * Don't print warning in such scenario. | ||
2413 | * | ||
2414 | * https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-net_id.c#L358 | ||
2415 | */ | ||
2416 | if (ndev->dev_port && ndev->dev_id == ndev->dev_port) | ||
2406 | netdev_info_once(ndev, | 2417 | netdev_info_once(ndev, |
2407 | "\"%s\" wants to know my dev_id. Should it look at dev_port instead? See Documentation/ABI/testing/sysfs-class-net for more info.\n", | 2418 | "\"%s\" wants to know my dev_id. Should it look at dev_port instead? See Documentation/ABI/testing/sysfs-class-net for more info.\n", |
2408 | current->comm); | 2419 | current->comm); |