patch-2.4.22 linux-2.4.22/net/irda/ircomm/ircomm_tty.c
Next file: linux-2.4.22/net/irda/ircomm/ircomm_tty_attach.c
Previous file: linux-2.4.22/net/irda/ircomm/ircomm_param.c
Back to the patch index
Back to the overall index
- Lines: 98
- Date:
2003-08-25 04:44:44.000000000 -0700
- Orig file:
linux-2.4.21/net/irda/ircomm/ircomm_tty.c
- Orig date:
2003-06-13 07:51:39.000000000 -0700
diff -urN linux-2.4.21/net/irda/ircomm/ircomm_tty.c linux-2.4.22/net/irda/ircomm/ircomm_tty.c
@@ -417,8 +417,8 @@
self->line = line;
self->tqueue.routine = ircomm_tty_do_softint;
self->tqueue.data = self;
- self->max_header_size = IRCOMM_TTY_HDR_UNITIALISED;
- self->max_data_size = 64-self->max_header_size;
+ self->max_header_size = IRCOMM_TTY_HDR_UNINITIALISED;
+ self->max_data_size = IRCOMM_TTY_DATA_UNINITIALISED;
self->close_delay = 5*HZ/10;
self->closing_wait = 30*HZ;
@@ -696,16 +696,26 @@
/* We may receive packets from the TTY even before we have finished
* our setup. Not cool.
- * The problem is that we would allocate a skb with bogus header and
- * data size, and when adding data to it later we would get
- * confused.
- * Better to not accept data until we are properly setup. Use bogus
- * header size to check that (safest way to detect it).
+ * The problem is that we don't know the final header and data size
+ * to create the proper skb, so any skb we would create would have
+ * bogus header and data size, so need care.
+ * We use a bogus header size to safely detect this condition.
+ * Another problem is that hw_stopped was set to 0 way before it
+ * should be, so we would drop this skb. It should now be fixed.
+ * One option is to not accept data until we are properly setup.
+ * But, I suspect that when it happens, the ppp line discipline
+ * just "drops" the data, which might screw up connect scripts.
+ * The second option is to create a "safe skb", with large header
+ * and small size (see ircomm_tty_open() for values).
+ * We just need to make sure that when the real values get filled,
+ * we don't mess up the original "safe skb" (see tx_data_size).
* Jean II */
- if (self->max_header_size == IRCOMM_TTY_HDR_UNITIALISED) {
- /* TTY will retry */
- IRDA_DEBUG(2, __FUNCTION__ "() : not initialised\n");
- return len;
+ if (self->max_header_size == IRCOMM_TTY_HDR_UNINITIALISED) {
+ IRDA_DEBUG(1, "%s() : not initialised\n", __FUNCTION__);
+#ifdef IRCOMM_NO_TX_BEFORE_INIT
+ /* We didn't consume anything, TTY will retry */
+ return 0;
+#endif
}
save_flags(flags);
@@ -739,8 +749,11 @@
* transmit buffer? Cannot use skb_tailroom, since
* dev_alloc_skb gives us a larger skb than we
* requested
+ * Note : use tx_data_size, because max_data_size
+ * may have changed and we don't want to overwrite
+ * the skb. - Jean II
*/
- if ((tailroom = (self->max_data_size-skb->len)) > 0) {
+ if ((tailroom = (self->tx_data_size - skb->len)) > 0) {
/* Adjust data to tailroom */
if (size > tailroom)
size = tailroom;
@@ -761,6 +774,9 @@
}
skb_reserve(skb, self->max_header_size);
self->tx_skb = skb;
+ /* Remember skb size because max_data_size may
+ * change later on - Jean II */
+ self->tx_data_size = self->max_data_size;
}
/* Copy data */
@@ -804,18 +820,23 @@
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+#ifdef IRCOMM_NO_TX_BEFORE_INIT
+ /* max_header_size tells us if the channel is initialised or not. */
+ if (self->max_header_size == IRCOMM_TTY_HDR_UNINITIALISED)
+ /* Don't bother us yet */
+ return 0;
+#endif
+
/* Check if we are allowed to transmit any data.
* hw_stopped is the regular flow control.
- * max_header_size tells us if the channel is initialised or not.
* Jean II */
- if ((tty->hw_stopped) ||
- (self->max_header_size == IRCOMM_TTY_HDR_UNITIALISED))
+ if (tty->hw_stopped)
ret = 0;
else {
save_flags(flags);
cli();
if (self->tx_skb)
- ret = self->max_data_size - self->tx_skb->len;
+ ret = self->tx_data_size - self->tx_skb->len;
else
ret = self->max_data_size;
restore_flags(flags);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)