[PATCH 1/4] [IrDA] Resend frames on timeout

[samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org]

[-- Attachment #1: irlap_resend_ftimer.patch --]
[-- Type: text/plain, Size: 1677 bytes --]

From: Robie Basak <rb-oss-1-ptXJlWIB0NTrnbRv5XOUuA@public.gmane.org>

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-ptXJlWIB0NTrnbRv5XOUuA@public.gmane.org>
Signed-off-by: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
---
 net/irda/irlap_event.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Index: net-2.6.25/net/irda/irlap_event.c
===================================================================
--- net-2.6.25.orig/net/irda/irlap_event.c	2008-01-14 19:27:06.000000000 +0100
+++ net-2.6.25/net/irda/irlap_event.c	2008-01-17 06:33:33.000000000 +0100
@@ -1514,9 +1514,15 @@
 
 		/* 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++;

-- 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/