Skip to content

Commit 315edda

Browse files
author
CKI KWF Bot
committed
Merge: net/smc: Fix lookup of netdev by using ib_device_get_netdev()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7166 JIRA: https://issues.redhat.com/browse/RHEL-102713 commit de88df0 Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 7ad697d + 4f0ce3d commit 315edda

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

net/smc/smc_ib.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -899,9 +899,7 @@ static void smc_copy_netdev_ifindex(struct smc_ib_device *smcibdev, int port)
899899
struct ib_device *ibdev = smcibdev->ibdev;
900900
struct net_device *ndev;
901901

902-
if (!ibdev->ops.get_netdev)
903-
return;
904-
ndev = ibdev->ops.get_netdev(ibdev, port + 1);
902+
ndev = ib_device_get_netdev(ibdev, port + 1);
905903
if (ndev) {
906904
smcibdev->ndev_ifidx[port] = ndev->ifindex;
907905
dev_put(ndev);
@@ -921,9 +919,7 @@ void smc_ib_ndev_change(struct net_device *ndev, unsigned long event)
921919
port_cnt = smcibdev->ibdev->phys_port_cnt;
922920
for (i = 0; i < min_t(size_t, port_cnt, SMC_MAX_PORTS); i++) {
923921
libdev = smcibdev->ibdev;
924-
if (!libdev->ops.get_netdev)
925-
continue;
926-
lndev = libdev->ops.get_netdev(libdev, i + 1);
922+
lndev = ib_device_get_netdev(libdev, i + 1);
927923
dev_put(lndev);
928924
if (lndev != ndev)
929925
continue;

net/smc/smc_pnet.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,9 +1057,7 @@ static void smc_pnet_find_rdma_dev(struct net_device *netdev,
10571057
for (i = 1; i <= SMC_MAX_PORTS; i++) {
10581058
if (!rdma_is_port_valid(ibdev->ibdev, i))
10591059
continue;
1060-
if (!ibdev->ibdev->ops.get_netdev)
1061-
continue;
1062-
ndev = ibdev->ibdev->ops.get_netdev(ibdev->ibdev, i);
1060+
ndev = ib_device_get_netdev(ibdev->ibdev, i);
10631061
if (!ndev)
10641062
continue;
10651063
dev_put(ndev);

0 commit comments

Comments
 (0)