From: G. Liakhovetski <[EMAIL PROTECTED]>
We need to switch to NRM _before_ sending the final packet otherwise we might
hit a race condition where we get the first packet from the peer while we're
still in LAP_XMIT_P.
Cc: G. Liakhovetski <[EMAIL PROTECTED]>
Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
---
include/net/irda/irlap.h | 17 +++++++++++++++++
net/irda/irlap_event.c | 18 ------------------
net/irda/irlap_frame.c | 3 +++
3 files changed, 20 insertions(+), 18 deletions(-)
Index: net-2.6-quilt/include/net/irda/irlap.h
===================================================================
--- net-2.6-quilt.orig/include/net/irda/irlap.h 2007-05-10 19:23:04.000000000
+0300
+++ net-2.6-quilt/include/net/irda/irlap.h 2007-05-10 19:24:57.000000000
+0300
@@ -289,4 +289,21 @@
self->disconnect_pending = FALSE;
}
+/*
+ * Function irlap_next_state (self, state)
+ *
+ * Switches state and provides debug information
+ *
+ */
+static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)
+{
+ /*
+ if (!self || self->magic != LAP_MAGIC)
+ return;
+
+ IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]);
+ */
+ self->state = state;
+}
+
#endif
Index: net-2.6-quilt/net/irda/irlap_event.c
===================================================================
--- net-2.6-quilt.orig/net/irda/irlap_event.c 2007-05-10 19:23:04.000000000
+0300
+++ net-2.6-quilt/net/irda/irlap_event.c 2007-05-10 19:23:09.000000000
+0300
@@ -317,23 +317,6 @@
}
/*
- * Function irlap_next_state (self, state)
- *
- * Switches state and provides debug information
- *
- */
-static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)
-{
- /*
- if (!self || self->magic != LAP_MAGIC)
- return;
-
- IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]);
- */
- self->state = state;
-}
-
-/*
* Function irlap_state_ndm (event, skb, frame)
*
* NDM (Normal Disconnected Mode) state
@@ -1086,7 +1069,6 @@
} else {
/* Final packet of window */
irlap_send_data_primary_poll(self, skb);
- irlap_next_state(self, LAP_NRM_P);
/*
* Make sure state machine does not try to send
Index: net-2.6-quilt/net/irda/irlap_frame.c
===================================================================
--- net-2.6-quilt.orig/net/irda/irlap_frame.c 2007-05-10 19:23:04.000000000
+0300
+++ net-2.6-quilt/net/irda/irlap_frame.c 2007-05-10 19:25:59.000000000
+0300
@@ -798,16 +798,19 @@
self->vs = (self->vs + 1) % 8;
self->ack_required = FALSE;
+ irlap_next_state(self, LAP_NRM_P);
irlap_send_i_frame(self, tx_skb, CMD_FRAME);
} else {
IRDA_DEBUG(4, "%s(), sending unreliable frame\n", __FUNCTION__);
if (self->ack_required) {
irlap_send_ui_frame(self, skb_get(skb), self->caddr,
CMD_FRAME);
+ irlap_next_state(self, LAP_NRM_P);
irlap_send_rr_frame(self, CMD_FRAME);
self->ack_required = FALSE;
} else {
skb->data[1] |= PF_BIT;
+ irlap_next_state(self, LAP_NRM_P);
irlap_send_ui_frame(self, skb_get(skb), self->caddr,
CMD_FRAME);
}
}
--
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
