diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-28 03:31:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-28 03:31:39 +0100 |
| commit | 9f6e055907362f6692185c1c9658295d24095c74 (patch) | |
| tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f /net/smc/smc_ib.c | |
| parent | mlxsw: reg: Update module_type values in PMTM register and map them to width (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-9f6e055907362f6692185c1c9658295d24095c74.tar.xz linux-9f6e055907362f6692185c1c9658295d24095c74.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.
The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_ib.c')
| -rw-r--r-- | net/smc/smc_ib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c index 3444de27fecd..9239cf881f21 100644 --- a/net/smc/smc_ib.c +++ b/net/smc/smc_ib.c @@ -591,6 +591,8 @@ static void smc_ib_remove_dev(struct ib_device *ibdev, void *client_data) struct smc_ib_device *smcibdev; smcibdev = ib_get_client_data(ibdev, &smc_ib_client); + if (!smcibdev || smcibdev->ibdev != ibdev) + return; ib_set_client_data(ibdev, &smc_ib_client, NULL); spin_lock(&smc_ib_devices.lock); list_del_init(&smcibdev->list); /* remove from smc_ib_devices */ |