diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-22 23:18:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-22 23:18:45 +0100 |
| commit | 5ddc236d094d496bcd1e78aaa88bdde530073b6f (patch) | |
| tree | 2435f76086b7bbf9739c05411baa2f1520cd9618 /drivers/infiniband/core/addr.c | |
| parent | 0d214f27c0e3d9694284c95bac1502c2d247355b (diff) | |
| parent | 602ff58ae4fe4289b0ca71cba9fb82f7de92cd64 (diff) | |
regulator: init_data handling update
Merge series from Jerome Brunet <jbrunet@baylibre.com>:
This patchset groups the regulator patches around the init_data topic
discussed on pmbus write protect patchset [1]
[1]: https://lore.kernel.org/r/20240920-pmbus-wp-v1-0-d679ef31c483@baylibre.com
Diffstat (limited to 'drivers/infiniband/core/addr.c')
| -rw-r--r-- | drivers/infiniband/core/addr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index be0743dac3ff..c4cf26f1d149 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -269,6 +269,8 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in) break; #endif } + if (!ret && dev && is_vlan_dev(dev)) + dev = vlan_dev_real_dev(dev); return ret ? ERR_PTR(ret) : dev; } |