Merge with Linux 2.4.3.

Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps.  This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.

17 files changed, 39 insertions, 32 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 250b22ae9..cad22b277 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -146,7 +146,7 @@ static void irda_disconnect_indication(void *instance, void *sap,
 
 	/* Close our TSAP.
 	 * If we leave it open, IrLMP put it back into the list of
-	 * unconnected LSAPs. The problem is that any incomming request
+	 * unconnected LSAPs. The problem is that any incoming request
 	 * can then be matched to this socket (and it will be, because
 	 * it is at the head of the list). This would prevent any
 	 * listening socket waiting on the same TSAP to get those requests.
@@ -229,7 +229,7 @@ static void irda_connect_confirm(void *instance, void *sap,
 /*
  * Function irda_connect_indication(instance, sap, qos, max_sdu_size, userdata)
  *
- *    Incomming connection
+ *    Incoming connection
  *
  */
 static void irda_connect_indication(void *instance, void *sap, 
@@ -285,7 +285,7 @@ static void irda_connect_indication(void *instance, void *sap,
 /*
  * Function irda_connect_response (handle)
  *
- *    Accept incomming connection
+ *    Accept incoming connection
  *
  */
 void irda_connect_response(struct irda_sock *self)
@@ -836,7 +836,7 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 /*
  * Function irda_accept (sock, newsock, flags)
  *
- *    Wait for incomming connection
+ *    Wait for incoming connection
  *
  */
 static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
@@ -1995,6 +1995,9 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 	if (get_user(len, optlen))
 		return -EFAULT;
 
+	if(optlen < 0)
+		return -EINVAL;
+		
 	switch (optname) {
 	case IRLMP_ENUMDEVICES:
 		/* Ask lmp for the current discovery log */
diff --git a/net/irda/ircomm/Makefile b/net/irda/ircomm/Makefile
index fe0a6a830..12c52cf24 100644
--- a/net/irda/ircomm/Makefile
+++ b/net/irda/ircomm/Makefile
@@ -9,7 +9,7 @@
 
 O_TARGET := ircomm_and_tty.o
 
-multi-objs := ircomm.o ircomm-tty.o
+list-multi := ircomm.o ircomm-tty.o
 ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o
 ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
 
diff --git a/net/irda/ircomm/ircomm_core.c b/net/irda/ircomm/ircomm_core.c
index 7ae03b0a6..bc791de5f 100644
--- a/net/irda/ircomm/ircomm_core.c
+++ b/net/irda/ircomm/ircomm_core.c
@@ -220,7 +220,7 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel,
 /*
  * Function ircomm_connect_indication (self, qos, skb)
  *
- *    Notify user layer about the incomming connection
+ *    Notify user layer about the incoming connection
  *
  */
 void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
diff --git a/net/irda/ircomm/ircomm_event.c b/net/irda/ircomm/ircomm_event.c
index 5b43be858..ea80c7874 100644
--- a/net/irda/ircomm/ircomm_event.c
+++ b/net/irda/ircomm/ircomm_event.c
@@ -151,7 +151,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
 /*
  * Function ircomm_state_waitr (self, event, skb)
  *
- *    IrCOMM has received an incomming connection request and is awaiting
+ *    IrCOMM has received an incoming connection request and is awaiting
  *    response from the user
  */
 static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, 
diff --git a/net/irda/ircomm/ircomm_lmp.c b/net/irda/ircomm/ircomm_lmp.c
index ca4526260..5ddd3e1de 100644
--- a/net/irda/ircomm/ircomm_lmp.c
+++ b/net/irda/ircomm/ircomm_lmp.c
@@ -219,7 +219,7 @@ int ircomm_lmp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
 /*
  * Function ircomm_lmp_data_indication (instance, sap, skb)
  *
- *    Incomming data which we must deliver to the state machine, to check
+ *    Incoming data which we must deliver to the state machine, to check
  *    we are still connected.
  */
 int ircomm_lmp_data_indication(void *instance, void *sap,
diff --git a/net/irda/ircomm/ircomm_ttp.c b/net/irda/ircomm/ircomm_ttp.c
index 642b8416a..d17a5b544 100644
--- a/net/irda/ircomm/ircomm_ttp.c
+++ b/net/irda/ircomm/ircomm_ttp.c
@@ -156,7 +156,7 @@ int ircomm_ttp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
 /*
  * Function ircomm_ttp_data_indication (instance, sap, skb)
  *
- *    Incomming data
+ *    Incoming data
  *
  */
 int ircomm_ttp_data_indication(void *instance, void *sap,
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index b88cc3d53..c7d931b98 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -1106,7 +1106,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
 /*
  * Function ircomm_tty_data_indication (instance, sap, skb)
  *
- *    Handle incomming data, and deliver it to the line discipline
+ *    Handle incoming data, and deliver it to the line discipline
  *
  */
 static int ircomm_tty_data_indication(void *instance, void *sap,
@@ -1155,7 +1155,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
 /*
  * Function ircomm_tty_control_indication (instance, sap, skb)
  *
- *    Parse all incomming parameters (easy!)
+ *    Parse all incoming parameters (easy!)
  *
  */
 static int ircomm_tty_control_indication(void *instance, void *sap,
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index 65d1e4409..f6a4c1c8d 100644
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -162,7 +162,7 @@ int irias_delete_attrib(struct ias_object *obj, struct ias_attrib *attrib)
 	ASSERT(obj->magic == IAS_OBJECT_MAGIC, return -1;);
 	ASSERT(attrib != NULL, return -1;);
 
-	/* Remove atribute from object */
+	/* Remove attribute from object */
 	node = hashbin_remove(obj->attribs, 0, attrib->name);
 	if (!node)
 		return 0; /* Already removed or non-existent */
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index e06807bd9..6df8e97f5 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -162,7 +162,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
 /*
  * Function irlan_provider_connect_response (handle)
  *
- *    Accept incomming connection
+ *    Accept incoming connection
  *
  */
 void irlan_provider_connect_response(struct irlan_cb *self,
@@ -371,7 +371,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
 /*
  * Function irlan_provider_register(void)
  *
- *    Register provider support so we can accept incomming connections.
+ *    Register provider support so we can accept incoming connections.
  * 
  */
 int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
diff --git a/net/irda/irlap.c b/net/irda/irlap.c
index b815f9f3a..c8bbecb8c 100644
--- a/net/irda/irlap.c
+++ b/net/irda/irlap.c
@@ -51,6 +51,7 @@
 hashbin_t *irlap = NULL;
 int sysctl_slot_timeout = SLOT_TIMEOUT * 1000 / HZ;
 
+extern void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb);
 static void __irlap_close(struct irlap_cb *self);
 
 static char *lap_reasons[] = {
@@ -241,7 +242,7 @@ void irlap_connect_indication(struct irlap_cb *self, struct sk_buff *skb)
 /*
  * Function irlap_connect_response (self, skb)
  *
- *    Service user has accepted incomming connection
+ *    Service user has accepted incoming connection
  *
  */
 void irlap_connect_response(struct irlap_cb *self, struct sk_buff *skb) 
diff --git a/net/irda/irlap_comp.c b/net/irda/irlap_comp.c
index e81fc7e4a..37d6a6fbf 100644
--- a/net/irda/irlap_comp.c
+++ b/net/irda/irlap_comp.c
@@ -92,7 +92,7 @@ void irda_unregister_compressor ( struct compressor *cp)
 /*
  * Function irda_set_compression (self, proto)
  *
- *    The the compression protocol to be used by this session
+ *    The compression protocol to be used by this session
  *
  */
 int irda_set_compression( struct irlap_cb *self, int proto)
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index 10a942584..6a2d34f61 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -546,7 +546,7 @@ static int irlap_state_query(struct irlap_cb *self, IRLAP_EVENT event,
 		break;
 	case SLOT_TIMER_EXPIRED:
 		/*
-		 * Wait a little longer if we detect an incomming frame. This
+		 * Wait a little longer if we detect an incoming frame. This
 		 * is not mentioned in the spec, but is a good thing to do, 
 		 * since we want to work even with devices that violate the
 		 * timing requirements.
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 29debb1bd..19b41e788 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -450,7 +450,7 @@ int irlmp_connect_request(struct lsap_cb *self, __u8 dlsap_sel,
 /*
  * Function irlmp_connect_indication (self)
  *
- *    Incomming connection
+ *    Incoming connection
  *
  */
 void irlmp_connect_indication(struct lsap_cb *self, struct sk_buff *skb) 
diff --git a/net/irda/irlmp_frame.c b/net/irda/irlmp_frame.c
index 56287afbb..803e598ff 100644
--- a/net/irda/irlmp_frame.c
+++ b/net/irda/irlmp_frame.c
@@ -470,7 +470,7 @@ static struct lsap_cb *irlmp_find_lsap(struct lap_cb *self, __u8 dlsap_sel,
 	lsap = (struct lsap_cb *) hashbin_get_first(queue);
 	while (lsap != NULL) {
 		/* 
-		 *  If this is an incomming connection, then the destination 
+		 *  If this is an incoming connection, then the destination 
 		 *  LSAP selector may have been specified as LM_ANY so that 
 		 *  any client can connect. In that case we only need to check
 		 *  if the source LSAP (in our view!) match!
diff --git a/net/irda/irnet/Config.in b/net/irda/irnet/Config.in
index d578593f1..ac6f9c433 100644
--- a/net/irda/irnet/Config.in
+++ b/net/irda/irnet/Config.in
@@ -1 +1,4 @@
-dep_tristate '  IrNET protocol' CONFIG_IRNET $CONFIG_IRDA
+if [ "$CONFIG_NETDEVICES" != "n" ]; then
+   dep_tristate '  IrNET protocol' CONFIG_IRNET $CONFIG_IRDA $CONFIG_PPP
+fi
+
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 6c9df66b3..e9f936737 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -9,7 +9,7 @@
  * what's in there...
  *
  * Note : as most part of the Linux kernel, this module is available
- * under the GNU Public License (GPL).
+ * under the GNU General Public License (GPL).
  */
 
 #ifndef IRNET_H
@@ -52,14 +52,14 @@
  *	o multipoint operation (limited by IrLAP specification)
  *	o information in /proc/net/irda/irnet
  *	o IrNET events on /dev/irnet (for user space daemon)
- *	o IrNET deamon (irnetd) to automatically handle incomming requests
+ *	o IrNET deamon (irnetd) to automatically handle incoming requests
  *	o Windows 2000 compatibility (tested, but need more work)
  * Currently missing :
  *	o Lot's of testing (that's your job)
  *	o Connection retries (may be too hard to do)
  *	o Check pppd persist mode
- *	o User space deamon (to automatically handle incomming requests)
- *	o A registered device number (comming, waiting from an answer) 
+ *	o User space deamon (to automatically handle incoming requests)
+ *	o A registered device number (coming, waiting from an answer) 
  *	o Final integration in Linux-IrDA (up to Dag) 
  *
  * The setup is not currently the most easy, but this should get much
@@ -109,16 +109,16 @@
  * and allow to offer the event channel, useful for other stuff like debug.
  *
  * On the other hand, this require a loose coordination between the
- * present module and irnetd. One critical area is how incomming request
+ * present module and irnetd. One critical area is how incoming request
  * are handled.
- * When irnet receive an incomming request, it send an event to irnetd and
- * drop the incomming IrNET socket.
+ * When irnet receive an incoming request, it send an event to irnetd and
+ * drop the incoming IrNET socket.
  * irnetd start a pppd instance, which create a new IrNET socket. This new
  * socket is then connected in the originating node to the pppd instance.
  * At this point, in the originating node, the first socket is closed.
  *
  * I admit, this is a bit messy and waste some ressources. The alternative
- * is caching incomming socket, and that's also quite messy and waste
+ * is caching incoming socket, and that's also quite messy and waste
  * ressources.
  * We also make connection time slower. For example, on a 115 kb/s link it
  * adds 60ms to the connection time (770 ms). However, this is slower than
diff --git a/net/irda/irnet/irnet_irda.c b/net/irda/irnet/irnet_irda.c
index ead7ef678..0a1200484 100644
--- a/net/irda/irnet/irnet_irda.c
+++ b/net/irda/irnet/irnet_irda.c
@@ -523,7 +523,7 @@ irda_irnet_destroy(irnet_socket *	self)
 /*
  * The IrNET service is composed of one server socket and a variable
  * number of regular IrNET sockets. The server socket is supposed to
- * handle incomming connections and redirect them to one IrNET sockets.
+ * handle incoming connections and redirect them to one IrNET sockets.
  * It's a superset of the regular IrNET socket, but has a very distinct
  * behaviour...
  */
@@ -662,7 +662,7 @@ irnet_find_socket(irnet_socket *	self)
 /*
  * Function irda_connect_socket (self)
  *
- *    Connect an incomming connection to the socket
+ *    Connect an incoming connection to the socket
  *
  */
 static inline int
@@ -721,7 +721,7 @@ irnet_connect_socket(irnet_socket *	self,
 /*
  * Function irda_disconnect_server (self)
  *
- *    Cleanup the server socket when the incomming connection abort
+ *    Cleanup the server socket when the incoming connection abort
  *
  */
 static inline void
@@ -1097,7 +1097,7 @@ irnet_status_indication(void *	instance,
 /*
  * Function irnet_connect_indication(instance, sap, qos, max_sdu_size, userdata)
  *
- *    Incomming connection
+ *    Incoming connection
  *
  * In theory, this function is called only on the server socket.
  * Some other node is attempting to connect to the IrNET service, and has