Patched in Tegra support.

4 files changed, 77 insertions, 64 deletions

diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index b4ba0670dc5..0aeb5a38d29 100644
--- a/drivers/tty/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
@@ -1729,7 +1729,7 @@ void ipwireless_hardware_free(struct ipw_hardware *hw)
 
         ipwireless_stop_interrupts(hw);
 
-        flush_work(&hw->work_rx);
+        flush_work_sync(&hw->work_rx);
 
         for (i = 0; i < NL_NUM_OF_ADDRESSES; i++)
                 if (hw->packet_assembler[i] != NULL)
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index c0dfb642383..f7daeea598e 100644
--- a/drivers/tty/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
@@ -22,7 +22,7 @@
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
 #include <linux/slab.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/skbuff.h>
 
 #include "network.h"
@@ -274,12 +274,7 @@ static void do_go_online(struct work_struct *work_go_online)
                 network->xaccm[0] = ~0U;
                 network->xaccm[3] = 0x60000000U;
                 network->raccm = ~0U;
-                if (ppp_register_channel(channel) < 0) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": unable to register PPP channel\n");
-                        kfree(channel);
-                        return;
-                }
+                ppp_register_channel(channel);
                 spin_lock_irqsave(&network->lock, flags);
                 network->ppp_channel = channel;
         }
@@ -352,8 +347,6 @@ static struct sk_buff *ipw_packet_received_skb(unsigned char *data,
         }
 
         skb = dev_alloc_skb(length + 4);
-        if (skb == NULL)
-                return NULL;
         skb_reserve(skb, 2);
         memcpy(skb_put(skb, length), data, length);
 
@@ -399,8 +392,7 @@ void ipwireless_network_packet_received(struct ipw_network *network,
 
                                 /* Send the data to the ppp_generic module. */
                                 skb = ipw_packet_received_skb(data, length);
-                                if (skb)
-                                        ppp_input(network->ppp_channel, skb);
+                                ppp_input(network->ppp_channel, skb);
                         } else
                                 spin_unlock_irqrestore(&network->lock,
                                                 flags);
@@ -438,8 +430,8 @@ void ipwireless_network_free(struct ipw_network *network)
         network->shutting_down = 1;
 
         ipwireless_ppp_close(network);
-        flush_work(&network->work_go_online);
-        flush_work(&network->work_go_offline);
+        flush_work_sync(&network->work_go_online);
+        flush_work_sync(&network->work_go_offline);
 
         ipwireless_stop_interrupts(network->hardware);
         ipwireless_associate_network(network->hardware, NULL);
diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h
index 002c34e7252..9d6bcc77c73 100644
--- a/drivers/tty/ipwireless/setup_protocol.h
+++ b/drivers/tty/ipwireless/setup_protocol.h
@@ -59,7 +59,7 @@ struct tl_setup_config_done_msg {
         unsigned char sig_no;           /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */
 } __attribute__ ((__packed__));
 
-/* Asynchronous messages */
+/* Asyncronous messages */
 struct tl_setup_open_msg {
         unsigned char sig_no;           /* TL_SETUP_SIGNO_OPEN_MSG */
         unsigned char port_no;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 2cde13ddf9f..ef92869502a 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -21,7 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/ppp_defs.h>
 #include <linux/if.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/sched.h>
 #include <linux/serial.h>
 #include <linux/slab.h>
@@ -44,13 +44,14 @@
 #define TTYTYPE_RAS_RAW  (2)
 
 struct ipw_tty {
-        struct tty_port port;
         int index;
         struct ipw_hardware *hardware;
         unsigned int channel_idx;
         unsigned int secondary_channel_idx;
         int tty_type;
         struct ipw_network *network;
+        struct tty_struct *linux_tty;
+        int open_count;
         unsigned int control_lines;
         struct mutex ipw_tty_mutex;
         int tx_bytes_queued;
@@ -72,23 +73,50 @@ static char *tty_type_name(int tty_type)
         return channel_names[tty_type];
 }
 
-static struct ipw_tty *get_tty(int index)
+static void report_registering(struct ipw_tty *tty)
 {
-        /*
-         * The 'ras_raw' channel is only available when 'loopback' mode
-         * is enabled.
-         * Number of minor starts with 16 (_RANGE * _RAS_RAW).
-         */
-        if (!ipwireless_loopback && index >=
-                         IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
-                return NULL;
+        char *iftype = tty_type_name(tty->tty_type);
+
+        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
+               ": registering %s device ttyIPWp%d\n", iftype, tty->index);
+}
+
+static void report_deregistering(struct ipw_tty *tty)
+{
+        char *iftype = tty_type_name(tty->tty_type);
 
-        return ttys[index];
+        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
+               ": deregistering %s device ttyIPWp%d\n", iftype,
+               tty->index);
+}
+
+static struct ipw_tty *get_tty(int minor)
+{
+        if (minor < ipw_tty_driver->minor_start
+                        || minor >= ipw_tty_driver->minor_start +
+                        IPWIRELESS_PCMCIA_MINORS)
+                return NULL;
+        else {
+                int minor_offset = minor - ipw_tty_driver->minor_start;
+
+                /*
+                 * The 'ras_raw' channel is only available when 'loopback' mode
+                 * is enabled.
+                 * Number of minor starts with 16 (_RANGE * _RAS_RAW).
+                 */
+                if (!ipwireless_loopback &&
+                                minor_offset >=
+                                 IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
+                        return NULL;
+
+                return ttys[minor_offset];
+        }
 }
 
 static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
 {
-        struct ipw_tty *tty = get_tty(linux_tty->index);
+        int minor = linux_tty->index;
+        struct ipw_tty *tty = get_tty(minor);
 
         if (!tty)
                 return -ENODEV;
@@ -99,12 +127,12 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return -ENODEV;
         }
-        if (tty->port.count == 0)
+        if (tty->open_count == 0)
                 tty->tx_bytes_queued = 0;
 
-        tty->port.count++;
+        tty->open_count++;
 
-        tty->port.tty = linux_tty;
+        tty->linux_tty = linux_tty;
         linux_tty->driver_data = tty;
         linux_tty->low_latency = 1;
 
@@ -118,13 +146,13 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
 
 static void do_ipw_close(struct ipw_tty *tty)
 {
-        tty->port.count--;
+        tty->open_count--;
 
-        if (tty->port.count == 0) {
-                struct tty_struct *linux_tty = tty->port.tty;
+        if (tty->open_count == 0) {
+                struct tty_struct *linux_tty = tty->linux_tty;
 
                 if (linux_tty != NULL) {
-                        tty->port.tty = NULL;
+                        tty->linux_tty = NULL;
                         linux_tty->driver_data = NULL;
 
                         if (tty->tty_type == TTYTYPE_MODEM)
@@ -141,7 +169,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
                 return;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        if (tty->port.count == 0) {
+        if (tty->open_count == 0) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
@@ -164,13 +192,13 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
         int work = 0;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        linux_tty = tty->port.tty;
+        linux_tty = tty->linux_tty;
         if (linux_tty == NULL) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
 
-        if (!tty->port.count) {
+        if (!tty->open_count) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
@@ -212,7 +240,7 @@ static int ipw_write(struct tty_struct *linux_tty,
                 return -ENODEV;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        if (!tty->port.count) {
+        if (!tty->open_count) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return -EINVAL;
         }
@@ -252,7 +280,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
@@ -294,7 +322,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
         if (!tty)
                 return 0;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return 0;
 
         return tty->tx_bytes_queued;
@@ -375,7 +403,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         return get_control_lines(tty);
@@ -391,7 +419,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         return set_control_lines(tty, set, clear);
@@ -405,7 +433,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         /* FIXME: Exactly how is the tty object locked here .. */
@@ -474,21 +502,16 @@ static int add_tty(int j,
         ttys[j]->network = network;
         ttys[j]->tty_type = tty_type;
         mutex_init(&ttys[j]->ipw_tty_mutex);
-        tty_port_init(&ttys[j]->port);
 
-        tty_port_register_device(&ttys[j]->port, ipw_tty_driver, j, NULL);
+        tty_register_device(ipw_tty_driver, j, NULL);
         ipwireless_associate_network_tty(network, channel_idx, ttys[j]);
 
         if (secondary_channel_idx != -1)
                 ipwireless_associate_network_tty(network,
                                                  secondary_channel_idx,
                                                  ttys[j]);
-        /* check if we provide raw device (if loopback is enabled) */
-        if (get_tty(j))
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": registering %s device ttyIPWp%d\n",
-                       tty_type_name(tty_type), j);
-
+        if (get_tty(j + ipw_tty_driver->minor_start) == ttys[j])
+                report_registering(ttys[j]);
         return 0;
 }
 
@@ -547,26 +570,23 @@ void ipwireless_tty_free(struct ipw_tty *tty)
 
                 if (ttyj) {
                         mutex_lock(&ttyj->ipw_tty_mutex);
-                        if (get_tty(j))
-                                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                                       ": deregistering %s device ttyIPWp%d\n",
-                                       tty_type_name(ttyj->tty_type), j);
+                        if (get_tty(j + ipw_tty_driver->minor_start) == ttyj)
+                                report_deregistering(ttyj);
                         ttyj->closing = 1;
-                        if (ttyj->port.tty != NULL) {
+                        if (ttyj->linux_tty != NULL) {
                                 mutex_unlock(&ttyj->ipw_tty_mutex);
-                                tty_vhangup(ttyj->port.tty);
+                                tty_hangup(ttyj->linux_tty);
+                                /* Wait till the tty_hangup has completed */
+                                flush_work_sync(&ttyj->linux_tty->hangup_work);
                                 /* FIXME: Exactly how is the tty object locked here
                                    against a parallel ioctl etc */
-                                /* FIXME2: hangup does not mean all processes
-                                 * are gone */
                                 mutex_lock(&ttyj->ipw_tty_mutex);
                         }
-                        while (ttyj->port.count)
+                        while (ttyj->open_count)
                                 do_ipw_close(ttyj);
                         ipwireless_disassociate_network_ttys(network,
                                                              ttyj->channel_idx);
                         tty_unregister_device(ipw_tty_driver, j);
-                        tty_port_destroy(&ttyj->port);
                         ttys[j] = NULL;
                         mutex_unlock(&ttyj->ipw_tty_mutex);
                         kfree(ttyj);
@@ -594,6 +614,7 @@ int ipwireless_tty_init(void)
         if (!ipw_tty_driver)
                 return -ENOMEM;
 
+        ipw_tty_driver->owner = THIS_MODULE;
         ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
         ipw_tty_driver->name = "ttyIPWp";
         ipw_tty_driver->major = 0;
@@ -651,8 +672,8 @@ ipwireless_tty_notify_control_line_change(struct ipw_tty *tty,
          */
         if ((old_control_lines & IPW_CONTROL_LINE_DCD)
                         && !(tty->control_lines & IPW_CONTROL_LINE_DCD)
-                        && tty->port.tty) {
-                tty_hangup(tty->port.tty);
+                        && tty->linux_tty) {
+                tty_hangup(tty->linux_tty);
         }
 }