Merge with Linux 2.3.32.

7 files changed, 17 insertions, 7 deletions

diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index d633d0e51..a16d928b3 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Apr 14 12:41:42 1998
- * Modified at:   Tue Oct 19 20:00:03 1999
+ * Modified at:   Tue Nov 16 12:54:01 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
@@ -164,6 +164,7 @@ int  irda_device_is_receiving(struct net_device *dev);
 int  irda_device_txqueue_empty(struct net_device *dev);
 int  irda_device_set_raw_mode(struct net_device* self, int status);
 int  irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts);
+int  irda_device_change_speed(struct net_device *dev, __u32 speed);
 int  irda_device_setup(struct net_device *dev);
 
 /* Dongle interface */
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h
index 8059956fa..0e6a52a0a 100644
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Mon Aug  4 20:40:53 1997
- * Modified at:   Thu Oct  7 23:06:36 1999
+ * Modified at:   Tue Nov 16 10:00:36 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>, 
@@ -162,6 +162,8 @@ struct irlap_cb {
 	hashbin_t   *discovery_log;
  	discovery_t *discovery_cmd;
 
+	__u32 speed; 
+
 	struct qos_info  qos_tx;   /* QoS requested by peer */
 	struct qos_info  qos_rx;   /* QoS requested by self */
 	struct qos_info *qos_dev;  /* QoS supported by device */
@@ -220,7 +222,7 @@ int irlap_validate_ns_received(struct irlap_cb *, int ns);
 int  irlap_generate_rand_time_slot(int S, int s);
 void irlap_initiate_connection_state(struct irlap_cb *);
 void irlap_flush_all_queues(struct irlap_cb *);
-void irlap_change_speed(struct irlap_cb *self, __u32 speed);
+void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now);
 void irlap_wait_min_turn_around(struct irlap_cb *, struct qos_info *);
 
 void irlap_init_qos_capabilities(struct irlap_cb *, struct qos_info *);
diff --git a/include/net/irda/irport.h b/include/net/irda/irport.h
index d02bc92b0..ed5e2e92a 100644
--- a/include/net/irda/irport.h
+++ b/include/net/irda/irport.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Sun Aug  3 13:49:59 1997
- * Modified at:   Sat Oct 30 19:54:07 1999
+ * Modified at:   Sat Nov 13 23:48:55 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1997, 1998-1999 Dag Brattli <dagb@cs.uit.no>
@@ -64,6 +64,7 @@ struct irport_cb {
 	dongle_t *dongle;          /* Dongle driver */
 
  	__u32 flags;               /* Interface flags */
+	__u32 new_speed;
 
 	spinlock_t lock;           /* For serializing operations */
 
@@ -74,6 +75,7 @@ void irport_start(struct irport_cb *self, int iobase);
 void irport_stop(struct irport_cb *self, int iobase);
 int  irport_probe(int iobase);
 
+int irport_change_speed(struct irda_task *task);
 void __irport_change_speed(struct irport_cb *self, __u32 speed);
 void irport_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 int  irport_hard_xmit(struct sk_buff *skb, struct net_device *dev);
diff --git a/include/net/irda/irtty.h b/include/net/irda/irtty.h
index 5c418c355..757425853 100644
--- a/include/net/irda/irtty.h
+++ b/include/net/irda/irtty.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Dec  9 21:13:12 1997
- * Modified at:   Mon Oct 18 23:24:31 1999
+ * Modified at:   Fri Nov  5 10:46:51 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  *  
  *     Copyright (c) 1997, 1999 Dag Brattli, All Rights Reserved.
@@ -61,6 +61,8 @@ struct irtty_cb {
 	struct qos_info qos;       /* QoS capabilities for this device */
 	dongle_t *dongle;          /* Dongle driver */
 
+	__u32 new_speed;
+
  	__u32 flags;               /* Interface flags */
 
 	INFRARED_MODE mode;
diff --git a/include/net/irda/pc87108.h b/include/net/irda/pc87108.h
index 7af5c0383..d7b63a38f 100644
--- a/include/net/irda/pc87108.h
+++ b/include/net/irda/pc87108.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Fri Nov 13 14:37:40 1998
- * Modified at:   Mon Oct 18 15:08:53 1999
+ * Modified at:   Mon Nov  8 10:00:27 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>
@@ -194,6 +194,7 @@ struct pc87108 {
 	struct qos_info qos;       /* QoS capabilities for this device */
 	
 	__u32 flags;               /* Interface flags */
+	__u32 new_speed;
 };
 
 static inline void switch_bank(int iobase, int bank)
diff --git a/include/net/irda/toshoboe.h b/include/net/irda/toshoboe.h
index 40e781690..96d9f2ec5 100644
--- a/include/net/irda/toshoboe.h
+++ b/include/net/irda/toshoboe.h
@@ -163,6 +163,7 @@ struct toshoboe_cb
     struct qos_info qos;       /* QoS capabilities for this device */
 
     __u32 flags;               /* Interface flags */
+    __u32 new_speed;
 
     struct pci_dev *pdev;       /*PCI device */
     int base;                   /*IO base */
diff --git a/include/net/irda/w83977af_ir.h b/include/net/irda/w83977af_ir.h
index e94271e66..afd04bf86 100644
--- a/include/net/irda/w83977af_ir.h
+++ b/include/net/irda/w83977af_ir.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Paul VanderSpek
  * Created at:    Thu Nov 19 13:55:34 1998
- * Modified at:   Fri Oct 15 16:06:46 1999
+ * Modified at:   Mon Nov  8 10:00:40 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved.
@@ -181,6 +181,7 @@ struct w83977af_ir {
 	struct qos_info qos;       /* QoS capabilities for this device */
 	
 	__u32 flags;               /* Interface flags */
+	__u32 new_speed;
 };
 
 static inline void switch_bank( int iobase, int set)