[PATCH] IrLAP retry count

ir260_lap_retry_count.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~
	o [CORRECT] add interoperability workaround for 2.4.X IrDA stacks

diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index b6df8f99d6f68217e7c72c278d3f6ebf5db31ee2..16fbb21637acc33dc24ef40fbda530d01c75f0c0 100644 (file)
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -1215,35 +1215,31 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event,
                 *  Check for expected I(nformation) frame
                 */
                if ((ns_status == NS_EXPECTED) && (nr_status == NR_EXPECTED)) {
-                       /*  poll bit cleared?  */
-                       if (!info->pf) {
-                               self->vr = (self->vr + 1) % 8;
 
-                               /* Update Nr received */
-                               irlap_update_nr_received( self, info->nr);
+                       /* Update Vr (next frame for us to receive) */
+                       self->vr = (self->vr + 1) % 8;
 
-                               self->ack_required = TRUE;
+                       /* Update Nr received, cleanup our retry queue */
+                       irlap_update_nr_received(self, info->nr);
+
+                       /*
+                        *  Got expected NR, so reset the
+                        *  retry_count. This is not done by IrLAP spec,
+                        *  which is strange!
+                        */
+                       self->retry_count = 0;
+                       self->ack_required = TRUE;
 
+                       /*  poll bit cleared?  */
+                       if (!info->pf) {
                                /* Keep state, do not move this line */
                                irlap_next_state(self, LAP_NRM_P);
 
                                irlap_data_indication(self, skb, FALSE);
                        } else {
+                               /* No longer waiting for pf */
                                del_timer(&self->final_timer);
 
-                               self->vr = (self->vr + 1) % 8;
-
-                               /* Update Nr received */
-                               irlap_update_nr_received(self, info->nr);
-
-                               /*
-                                *  Got expected NR, so reset the
-                                *  retry_count. This is not done by IrLAP,
-                                *  which is strange!
-                                */
-                               self->retry_count = 0;
-                               self->ack_required = TRUE;
-
                                irlap_wait_min_turn_around(self, &self->qos_tx);
 
                                /* Call higher layer *before* changing state
@@ -1869,14 +1865,17 @@ static int irlap_state_nrm_s(struct irlap_cb *self, IRLAP_EVENT event,
                 *  Check for expected I(nformation) frame
                 */
                if ((ns_status == NS_EXPECTED) && (nr_status == NR_EXPECTED)) {
+
+                       /* Update Vr (next frame for us to receive) */
+                       self->vr = (self->vr + 1) % 8;
+
+                       /* Update Nr received */
+                       irlap_update_nr_received(self, info->nr);
+
                        /*
                         *  poll bit cleared?
                         */
                        if (!info->pf) {
-                               self->vr = (self->vr + 1) % 8;
-
-                               /* Update Nr received */
-                               irlap_update_nr_received(self, info->nr);
 
                                self->ack_required = TRUE;
 
@@ -1893,11 +1892,6 @@ static int irlap_state_nrm_s(struct irlap_cb *self, IRLAP_EVENT event,
                                irlap_data_indication(self, skb, FALSE);
                                break;
                        } else {
-                               self->vr = (self->vr + 1) % 8;
-
-                               /* Update Nr received */
-                               irlap_update_nr_received(self, info->nr);
-
                                /*
                                 *  We should wait before sending RR, and
                                 *  also before changing to XMIT_S