diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-10-29 03:23:34 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-10-29 03:23:34 +0100 |
| commit | 63e8790d39a2d7c9a0ebeab987a6033d184bc6ba (patch) | |
| tree | 9436939401b222d344f66e2bda59b445d5b9189f /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | IB/ucma: Take the network namespace from the process (diff) | |
| parent | Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-c... (diff) | |
| download | linux-63e8790d39a2d7c9a0ebeab987a6033d184bc6ba.tar.xz linux-63e8790d39a2d7c9a0ebeab987a6033d184bc6ba.zip | |
Merge branch 'wr-cleanup' into k.o/for-4.4
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index edc5b8565d6d..3ede10309754 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -360,7 +360,7 @@ struct ipoib_dev_priv { unsigned tx_head; unsigned tx_tail; struct ib_sge tx_sge[MAX_SKB_FRAGS + 1]; - struct ib_send_wr tx_wr; + struct ib_ud_wr tx_wr; unsigned tx_outstanding; struct ib_wc send_wc[MAX_SEND_CQE]; @@ -528,7 +528,7 @@ static inline void ipoib_build_sge(struct ipoib_dev_priv *priv, priv->tx_sge[i + off].addr = mapping[i + off]; priv->tx_sge[i + off].length = skb_frag_size(&frags[i]); } - priv->tx_wr.num_sge = nr_frags + off; + priv->tx_wr.wr.num_sge = nr_frags + off; } #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG |