Merge r5995 from the iser branch

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6276 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 16:42:33 +00:00
parent d1b4a3384b
commit 0820ea491c

View File

@@ -166,7 +166,7 @@ static int add_new_connection(struct isert_listener_dev *dev,
init_timer(&conn_dev->tmo_timer);
conn_dev->tmo_timer.function = isert_conn_timer_fn;
conn_dev->tmo_timer.expires = jiffies + 120 * HZ;
conn_dev->tmo_timer.expires = jiffies + 60 * HZ;
conn_dev->tmo_timer.data = (unsigned long)conn_dev;
add_timer(&conn_dev->tmo_timer);
conn_dev->timer_active = 1;