diff options
| author | Robie Basak <rb-oss-1@justgohome.co.uk> | 2008-01-18 23:56:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:08:08 -0800 |
| commit | 6d97b53e92af822890b87818c99820df47fc589b (patch) | |
| tree | 2f5919891764d7c8992c44030ab303ae423af3f1 /net | |
| parent | 775516bfa2bd7993620c9039191a0c30b8d8a496 (diff) | |
| download | kernel_samsung_smdk4412-6d97b53e92af822890b87818c99820df47fc589b.tar.gz kernel_samsung_smdk4412-6d97b53e92af822890b87818c99820df47fc589b.tar.bz2 kernel_samsung_smdk4412-6d97b53e92af822890b87818c99820df47fc589b.zip | |
[IrDA]: Resend frames on timeout.
When final timer expires, it might also mean that the i:cmd wasn't
received properly. If we have rejected frames, we can try to resend them.
Signed-off-by: Robie Basak <rb-oss-1@justgohome.co.uk>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/irlap_event.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index 4c33bf5c835..6d3aff862dc 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c @@ -1514,9 +1514,15 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event, /* N2 is the disconnect timer. Until we reach it, we retry */ if (self->retry_count < self->N2) { - /* Retry sending the pf bit to the secondary */ - irlap_wait_min_turn_around(self, &self->qos_tx); - irlap_send_rr_frame(self, CMD_FRAME); + if (skb_peek(&self->wx_list) == NULL) { + /* Retry sending the pf bit to the secondary */ + IRDA_DEBUG(4, "nrm_p: resending rr"); + irlap_wait_min_turn_around(self, &self->qos_tx); + irlap_send_rr_frame(self, CMD_FRAME); + } else { + IRDA_DEBUG(4, "nrm_p: resend frames"); + irlap_resend_rejected_frames(self, CMD_FRAME); + } irlap_start_final_timer(self, self->final_timeout); self->retry_count++; |