diff options
author | Karsten Graul <kgraul@linux.ibm.com> | 2019-01-30 18:51:07 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-01 14:45:45 -0800 |
commit | e5f3aa04dbfd92154f21edfeb7a1676a45918928 (patch) | |
tree | fcc1aec701c7f929d6fef5b12354d962dcce1e47 /net/smc | |
parent | 2dee25af42f99b476d5916aeac5c994e4dcc910b (diff) | |
download | linux-stable-e5f3aa04dbfd92154f21edfeb7a1676a45918928.tar.gz linux-stable-e5f3aa04dbfd92154f21edfeb7a1676a45918928.tar.bz2 linux-stable-e5f3aa04dbfd92154f21edfeb7a1676a45918928.zip |
net/smc: use device link provided in qp_context
The device field of the IB event structure does not always point to the
SMC IB device. Load the pointer from the qp_context which is always
provided to smc_ib_qp_event_handler() in the priv field. And for qp
events the affected port is given in the qp structure of the ibevent,
derive it from there.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
-rw-r--r-- | net/smc/smc_ib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c index e519ef29c0ff..76487a16934e 100644 --- a/net/smc/smc_ib.c +++ b/net/smc/smc_ib.c @@ -289,8 +289,8 @@ int smc_ib_create_protection_domain(struct smc_link *lnk) static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv) { - struct smc_ib_device *smcibdev = - (struct smc_ib_device *)ibevent->device; + struct smc_link *lnk = (struct smc_link *)priv; + struct smc_ib_device *smcibdev = lnk->smcibdev; u8 port_idx; switch (ibevent->event) { @@ -298,7 +298,7 @@ static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv) case IB_EVENT_GID_CHANGE: case IB_EVENT_PORT_ERR: case IB_EVENT_QP_ACCESS_ERR: - port_idx = ibevent->element.port_num - 1; + port_idx = ibevent->element.qp->port - 1; set_bit(port_idx, &smcibdev->port_event_mask); schedule_work(&smcibdev->port_event_work); break; |