please pull infiniband.git
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a couple of fixes for medium-impact bugs. If they can go into -rc1, great; otherwise the world won't end if they end up in -rc2.
Eli Cohen (1):
IB/ipoib: Fix transmit queue stalling forever
Roland Dreier (1):
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
drivers/infiniband/hw/mlx4/cq.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib.h | 2 + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 47 +++++++++++++++++++++++++--- drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- 4 files changed, 48 insertions(+), 8 deletions(-)
drivers/infiniband/hw/mlx4/cq.c +2 -2
@@ -246,7 +246,7 @@ err_mtt:if (context)ib_umem_release (cq->umem);else -mlx4_ib_free_cq_buf (dev, &cq->buf, entries); +mlx4_ib_free_cq_buf (dev, &cq->buf, cq->ibcq.cqe); err_db:if (!context)
@@ -434,7 +434,7 @@ int mlx4_ib_destroy_cq(struct ib_cq *cq)mlx4_ib_db_unmap_user (to_mucontext (cq->uobject->context), &mcq->db);ib_umem_release (mcq->umem); }else { -mlx4_ib_free_cq_buf (dev, &mcq->buf, cq->cqe +1 ); +mlx4_ib_free_cq_buf (dev, &mcq->buf, cq->cqe);mlx4_db_free (dev->dev, &mcq->db); }
drivers/infiniband/ulp/ipoib/ipoib.h +2 -0
@@ -334,6 +334,7 @@ struct ipoib_dev_priv {#endif int hca_caps;struct ipoib_ethtool_st ethtool; +struct timer_list poll_timer; };struct ipoib_ah {
@@ -404,6 +405,7 @@ extern struct workqueue_struct *ipoib_workqueue;int ipoib_poll (struct napi_struct *napi,int budget);void ipoib_ib_completion (struct ib_cq *cq,void *dev_ptr); +void ipoib_send_comp_handler (struct ib_cq *cq,void *dev_ptr);struct ipoib_ah *ipoib_create_ah (struct net_device *dev,struct ib_pd *pd,struct ib_ah_attr *attr);
drivers/infiniband/ulp/ipoib/ipoib_ib.c +42 -5
92 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_verbs.c +2 -1
@@ -187,7 +187,8 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) goto out_free_mr; } - priv->send_cq =ib_create_cq (priv->ca,NULL ,NULL , dev, ipoib_sendq_size,0 ); + priv->send_cq =ib_create_cq (priv->ca, ipoib_send_comp_handler,NULL , + dev, ipoib_sendq_size,0 );if (IS_ERR (priv->send_cq)) {printk (KERN_WARNING "%s: failed to create send CQ\n" , ca->name); goto out_free_recv_cq;