diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-20 15:08:57 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-20 15:08:57 +0100 |
| commit | 1349584c26b5e9ebb6498dc910d55c52116e0f32 (patch) | |
| tree | b15944e7b07bf18fe2710fa02c0808cf7e148a4c | |
| parent | 606eae8ece62fdc5e075ac88f70a02ffb9df27c4 (diff) | |
mtp: Start the linktest directly
No need for delaying the linktest, start it directly when
the linkset should come up
| -rw-r--r-- | include/mtp_data.h | 2 | ||||
| -rw-r--r-- | src/mtp_layer3.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/mtp_data.h b/include/mtp_data.h index 062361c..7521f9b 100644 --- a/include/mtp_data.h +++ b/include/mtp_data.h @@ -63,8 +63,6 @@ struct mtp_link_set { struct timer_list t1_timer; struct timer_list t2_timer; - struct timer_list delay_timer; - struct llist_head links; struct mtp_link *slc[16]; diff --git a/src/mtp_layer3.c b/src/mtp_layer3.c index 40839c7..7cce467 100644 --- a/src/mtp_layer3.c +++ b/src/mtp_layer3.c @@ -257,11 +257,6 @@ static void mtp_sltm_t2_timeout(void *_link) bsc_schedule_timer(&link->t2_timer, MTP_T2); } -static void mtp_delayed_start(void *link) -{ - mtp_sltm_t2_timeout(link); -} - struct mtp_link_set *mtp_link_set_alloc(void) { struct mtp_link_set *link; @@ -275,8 +270,6 @@ struct mtp_link_set *mtp_link_set_alloc(void) link->t1_timer.cb = mtp_sltm_t1_timeout; link->t2_timer.data = link; link->t2_timer.cb = mtp_sltm_t2_timeout; - link->delay_timer.data = link; - link->delay_timer.cb = mtp_delayed_start; INIT_LLIST_HEAD(&link->links); return link; @@ -286,7 +279,6 @@ void mtp_link_set_stop(struct mtp_link_set *link) { bsc_del_timer(&link->t1_timer); bsc_del_timer(&link->t2_timer); - bsc_del_timer(&link->delay_timer); link->sccp_up = 0; link->running = 0; link->linkset_up = 0; @@ -299,7 +291,7 @@ void mtp_link_set_reset(struct mtp_link_set *link) { mtp_link_set_stop(link); link->running = 1; - bsc_schedule_timer(&link->delay_timer, START_DELAY); + mtp_sltm_t2_timeout(link); } static int send_tfp(struct mtp_link_set *link, int apoc) |