patch-2.3.29 linux/net/irda/irlap.c

• Lines: 98
• Date: Sun Nov 21 11:13:57 1999
• Orig file: v2.3.28/linux/net/irda/irlap.c
• Orig date: Wed Oct 27 16:34:12 1999

diff -u --recursive --new-file v2.3.28/linux/net/irda/irlap.c linux/net/irda/irlap.c
@@ -6,7 +6,7 @@
  * Status:        Stable
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Mon Aug  4 20:40:53 1997
- * Modified at:   Fri Oct  8 23:17:36 1999
+ * Modified at:   Tue Nov 16 10:01:06 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved.
@@ -65,7 +65,7 @@
 };
 
 #ifdef CONFIG_PROC_FS
-int irlap_proc_read(char *, char **, off_t, int, int);
+int irlap_proc_read(char *, char **, off_t, int);
 
 #endif /* CONFIG_PROC_FS */
 
@@ -849,16 +849,18 @@
  *    Change the speed of the IrDA port
  *
  */
-void irlap_change_speed(struct irlap_cb *self, __u32 speed)
+void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now)
 {
-	IRDA_DEBUG(4, __FUNCTION__ "(), setting speed to %d\n", speed);
+	IRDA_DEBUG(0, __FUNCTION__ "(), setting speed to %d\n", speed);
 
 	ASSERT(self != NULL, return;);
 	ASSERT(self->magic == LAP_MAGIC, return;);
 
-	/* Must use the same speed in both directions */
-	self->qos_rx.baud_rate.value = speed;
-	self->qos_tx.baud_rate.value = speed;
+	self->speed = speed;
+
+	/* Change speed now, or just piggyback speed on frames */
+	if (now)
+		irda_device_change_speed(self->netdev, speed);
 }
 
 #ifdef CONFIG_IRDA_COMPRESSION
@@ -878,16 +880,16 @@
 	 *  you get when you do a little bit flicking :-)
 	 */
 	IRDA_DEBUG(4, __FUNCTION__ "(), comp bits 0x%02x\n", 
-	       self->qos_rx.compression.bits); 
+		   self->qos_rx.compression.bits); 
 	mask = 0x80; /* Start with testing MSB */
 	for (i=0;i<8;i++) {
 		IRDA_DEBUG(4, __FUNCTION__ "(), testing bit %d\n", 8-i);
 		if (self->qos_rx.compression.bits & mask) {
-			IRDA_DEBUG(4, __FUNCTION__ "(), bit %d is set by defalt\n",
-			       8-i);
+			IRDA_DEBUG(4, __FUNCTION__ 
+				   "(), bit %d is set by defalt\n", 8-i);
 			comp = hashbin_find(irlap_compressors, 
-					     compression[ msb_index(mask)], 
-					     NULL);
+					    compression[msb_index(mask)], 
+					    NULL);
 			if (!comp) {
 				/* Protocol not supported, so clear the bit */
 				IRDA_DEBUG(4, __FUNCTION__ "(), Compression "
@@ -984,7 +986,7 @@
 	ASSERT(self != NULL, return;);
 	ASSERT(self->magic == LAP_MAGIC, return;);
 
-	irlap_change_speed(self, 9600);
+	irlap_change_speed(self, 9600, TRUE);
 
 	/* Default value in NDM */
 	self->bofs_count = 11;
@@ -1017,7 +1019,7 @@
 	ASSERT(self != NULL, return;);
 	ASSERT(self->magic == LAP_MAGIC, return;);
 
-	irlap_change_speed(self, qos->baud_rate.value);
+	irlap_change_speed(self, qos->baud_rate.value, FALSE);
 
 	self->window_size = qos->window_size.value;
 	self->window      = qos->window_size.value;
@@ -1085,13 +1087,12 @@
 
 #ifdef CONFIG_PROC_FS
 /*
- * Function irlap_proc_read (buf, start, offset, len, unused)
+ * Function irlap_proc_read (buf, start, offset, len)
  *
  *    Give some info to the /proc file system
  *
  */
-int irlap_proc_read(char *buf, char **start, off_t offset, int len, 
-		     int unused)
+int irlap_proc_read(char *buf, char **start, off_t offset, int len)
 {
 	struct irlap_cb *self;
 	unsigned long flags;