diff options
| author |   Andrew Boyer <andrew.boyer@dell.com> | 2016-11-23 12:39:20 -0500 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2016-12-12 16:31:45 -0500 |
| commit | d38eb801aa145aedf4b97e8e0bb2e65763aa6149 (patch) | |
| tree | cbae32bff4d63cef34c315f07e8649f5947cb22a /drivers/infiniband/sw/rxe | |
| parent | IB/rxe: Don't update the response PSN unless it's going forwards (diff) | |
| download | linux-dev-d38eb801aa145aedf4b97e8e0bb2e65763aa6149.tar.xz linux-dev-d38eb801aa145aedf4b97e8e0bb2e65763aa6149.zip | |
IB/rxe: Unblock loopback by moving skb_out increment
skb_out is decremented in rxe_skb_tx_dtor(), which is not called in the
loopback() path. Move the increment to the send() path rather than
rxe_xmit_packet().
Signed-off-by: Andrew Boyer <andrew.boyer@dell.com>
Acked-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw/rxe')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_loc.h | 2 | ||||
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_net.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index 73849a5a91b3..efe4c6a35442 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -266,8 +266,6 @@ static inline int rxe_xmit_packet(struct rxe_dev *rxe, struct rxe_qp *qp, return err; } - atomic_inc(&qp->skb_out); - if ((qp_type(qp) != IB_QPT_RC) && (pkt->mask & RXE_END_MASK)) { pkt->wqe->state = wqe_state_done; diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 4cb63780fa74..a576603304f7 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -459,6 +459,8 @@ static int send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, return -EAGAIN; } + if (pkt->qp) + atomic_inc(&pkt->qp->skb_out); kfree_skb(skb); return 0; |