Page MenuHomeFreeBSD
Files F176943197

D59687.1793635250.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D59687.1793635250.diff
View Options

diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -107,7 +107,7 @@
static void process_peer_close(struct c4iw_ep *ep);
static void process_conn_error(struct c4iw_ep *ep);
static void process_close_complete(struct c4iw_ep *ep);
-static void ep_timeout(unsigned long arg);
+static void ep_timeout(struct timer_list *t);
static void setiwsockopt(struct socket *so);
static void init_iwarp_socket(struct socket *so, void *arg);
static void uninit_iwarp_socket(struct socket *so);
@@ -1009,7 +1009,7 @@
GET_LOCAL_ADDR(&new_ep->com.local_addr, new_so);
GET_REMOTE_ADDR(&new_ep->com.remote_addr, new_so);
c4iw_get_ep(&real_lep->com);
- init_timer(&new_ep->timer);
+ timer_setup(&new_ep->timer, ep_timeout, 0);
new_ep->com.state = MPA_REQ_WAIT;
setiwsockopt(new_so);
@@ -1285,8 +1285,6 @@
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);
}
@@ -2615,7 +2613,7 @@
ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
cm_id->provider_data = ep;
- init_timer(&ep->timer);
+ timer_setup(&ep->timer, ep_timeout, 0);
ep->plen = conn_param->private_data_len;
if (ep->plen) {
@@ -2952,9 +2950,9 @@
-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 = timer_container_of(ep, t, timer);
if (!test_and_set_bit(TIMEOUT, &ep->com.flags)) {
diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c
--- a/sys/dev/cxgbe/iw_cxgbe/qp.c
+++ b/sys/dev/cxgbe/iw_cxgbe/qp.c
@@ -1885,7 +1885,9 @@
qhp->ucontext = ucontext;
}
qhp->ibqp.qp_num = qhp->wq.sq.qid;
+#ifdef __unused__
init_timer(&(qhp->timer));
+#endif
CTR5(KTR_IW_CXGBE, "%s sq id %u size %u memsize %zu num_entries %u",
__func__, qhp->wq.sq.qid,

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 2, 4:00 PM (18 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41329039
Default Alt Text
D59687.1793635250.diff (1 KB)

Event Timeline