Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894b82c4 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'timer_setup' into for-next 



Conflicts:
	drivers/infiniband/hw/cxgb4/cm.c
	drivers/infiniband/hw/qib/qib_driver.c
	drivers/infiniband/hw/qib/qib_mad.c

There were minor fixups needed in these files.  Just minor context diffs
due to patches from independent sources touching the same basic area.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 754137a7 a9346abe

drivers/infiniband/hw/cxgb3/iwch_cm.c

+5 −7
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct workqueue_struct *workq; 
static struct sk_buff_head rxq;



static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp);

static void ep_timeout(unsigned long arg);

static void ep_timeout(struct timer_list *t);

static void connect_reply_upcall(struct iwch_ep *ep, int status);



static void start_ep_timer(struct iwch_ep *ep)
@@ -119,8 +119,6 @@ static void start_ep_timer(struct iwch_ep *ep) 
	} else

		get_ep(&ep->com);

	ep->timer.expires = jiffies + ep_timeout_secs * HZ;

	ep->timer.data = (unsigned long)ep;

	ep->timer.function = ep_timeout;

	add_timer(&ep->timer);

}
@@ -1399,7 +1397,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx) 
	child_ep->l2t = l2t;

	child_ep->dst = dst;

	child_ep->hwtid = hwtid;

	init_timer(&child_ep->timer);

	timer_setup(&child_ep->timer, ep_timeout, 0);

	cxgb3_insert_tid(tdev, &t3c_client, child_ep, hwtid);

	accept_cr(child_ep, req->peer_ip, skb);

	goto out;
@@ -1719,9 +1717,9 @@ static int ec_status(struct t3cdev *tdev, struct sk_buff *skb, void *ctx) 
	return CPL_RET_BUF_DONE;

}



static void ep_timeout(unsigned long arg)

static void ep_timeout(struct timer_list *t)

{

	struct iwch_ep *ep = (struct iwch_ep *)arg;

	struct iwch_ep *ep = from_timer(ep, t, timer);

	struct iwch_qp_attributes attrs;

	unsigned long flags;

	int abort = 1;
@@ -1899,7 +1897,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		err = -ENOMEM;

		goto out;

	}

	init_timer(&ep->timer);

	timer_setup(&ep->timer, ep_timeout, 0);

	ep->plen = conn_param->private_data_len;

	if (ep->plen)

		memcpy(ep->mpa_pkt + sizeof(struct mpa_message),

drivers/infiniband/hw/cxgb3/iwch_provider.c

+0 −1
Original line number Diff line number Diff line
@@ -969,7 +969,6 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd, 
		insert_mmap(ucontext, mm2);

	}

	qhp->ibqp.qp_num = qhp->wq.qpid;

	init_timer(&(qhp->timer));

	pr_debug("%s sq_num_entries %d, rq_num_entries %d qpid 0x%0x qhp %p dma_addr 0x%llx size %d rq_addr 0x%x\n",

		 __func__, qhp->attr.sq_num_entries, qhp->attr.rq_num_entries,

		 qhp->wq.qpid, qhp, (unsigned long long)qhp->wq.dma_addr,

drivers/infiniband/hw/cxgb3/iwch_provider.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ struct iwch_qp { 
	atomic_t refcnt;

	wait_queue_head_t wait;

	enum IWCH_QP_FLAGS flags;

	struct timer_list timer;

};



static inline int qp_quiesced(struct iwch_qp *qhp)

drivers/infiniband/hw/cxgb4/cm.c

+5 −8
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static struct workqueue_struct *workq; 
static struct sk_buff_head rxq;



static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp);

static void ep_timeout(unsigned long arg);

static void ep_timeout(struct timer_list *t);

static void connect_reply_upcall(struct c4iw_ep *ep, int status);

static int sched(struct c4iw_dev *dev, struct sk_buff *skb);
@@ -185,8 +185,6 @@ static void start_ep_timer(struct c4iw_ep *ep) 
	clear_bit(TIMEOUT, &ep->com.flags);

	c4iw_get_ep(&ep->com);

	ep->timer.expires = jiffies + ep_timeout_secs * HZ;

	ep->timer.data = (unsigned long)ep;

	ep->timer.function = ep_timeout;

	add_timer(&ep->timer);

}
@@ -2103,7 +2101,6 @@ static int c4iw_reconnect(struct c4iw_ep *ep) 
	__u8 *ra;



	pr_debug("qp %p cm_id %p\n", ep->com.qp, ep->com.cm_id);

	init_timer(&ep->timer);

	c4iw_init_wr_wait(ep->com.wr_waitp);



	/* When MPA revision is different on nodes, the node with MPA_rev=2
@@ -2581,7 +2578,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
	pr_debug("tx_chan %u smac_idx %u rss_qid %u\n",

		 child_ep->tx_chan, child_ep->smac_idx, child_ep->rss_qid);



	init_timer(&child_ep->timer);

	timer_setup(&child_ep->timer, ep_timeout, 0);

	cxgb4_insert_tid(t, child_ep, hwtid,

			 child_ep->com.local_addr.ss_family);

	insert_ep_tid(child_ep);
@@ -3206,7 +3203,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		goto fail1;

	}



	init_timer(&ep->timer);

	timer_setup(&ep->timer, ep_timeout, 0);

	ep->plen = conn_param->private_data_len;

	if (ep->plen)

		memcpy(ep->mpa_pkt + sizeof(struct mpa_message),
@@ -4116,9 +4113,9 @@ static void process_work(struct work_struct *work) 


static DECLARE_WORK(skb_work, process_work);



static void ep_timeout(unsigned long arg)

static void ep_timeout(struct timer_list *t)

{

	struct c4iw_ep *ep = (struct c4iw_ep *)arg;

	struct c4iw_ep *ep = from_timer(ep, t, timer);

	int kickit = 0;



	spin_lock(&timeout_lock);

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −1
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ struct c4iw_qp { 
	struct mutex mutex;

	struct kref kref;

	wait_queue_head_t wait;

	struct timer_list timer;

	int sq_sig_all;

	struct work_struct free_work;

	struct c4iw_ucontext *ucontext;