Patched in Tegra support.

18 files changed, 232 insertions, 226 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index b833677d83d..c24f25ab67d 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -468,7 +468,7 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name)
         notify_t notify;
 
         if (self->tsap) {
-                IRDA_DEBUG(0, "%s: busy!\n", __func__);
+                IRDA_WARNING("%s: busy!\n", __func__);
                 return -EBUSY;
         }
 
@@ -955,7 +955,7 @@ out:
  * The main difference with a "standard" connect is that with IrDA we need
  * to resolve the service name into a TSAP selector (in TCP, port number
  * doesn't have to be resolved).
- * Because of this service name resolution, we can offer "auto-connect",
+ * Because of this service name resoltion, we can offer "auto-connect",
  * where we connect to a service without specifying a destination address.
  *
  * Note : by consulting "errno", the user space caller may learn the cause
@@ -2558,8 +2558,8 @@ bed:
                         self->errno = 0;
                         setup_timer(&self->watchdog, irda_discovery_timeout,
                                         (unsigned long)self);
-                        mod_timer(&self->watchdog,
-                                  jiffies + msecs_to_jiffies(val));
+                        self->watchdog.expires = jiffies + (val * HZ/1000);
+                        add_timer(&(self->watchdog));
 
                         /* Wait for IR-LMP to call us back */
                         __wait_event_interruptible(self->query_wait,
diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index b0b56a339a8..36c3f037f17 100644
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -35,7 +35,6 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irlmp.h>
diff --git a/net/irda/ircomm/ircomm_param.c b/net/irda/ircomm/ircomm_param.c
index 30893912835..8b915f3ac3b 100644
--- a/net/irda/ircomm/ircomm_param.c
+++ b/net/irda/ircomm/ircomm_param.c
@@ -99,6 +99,7 @@ pi_param_info_t ircomm_param_info = { pi_major_call_table, 3, 0x0f, 4 };
  */
 int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
 {
+        struct tty_struct *tty;
         unsigned long flags;
         struct sk_buff *skb;
         int count;
@@ -108,6 +109,10 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
+        tty = self->tty;
+        if (!tty)
+                return 0;
+
         /* Make sure we don't send parameters for raw mode */
         if (self->service_type == IRCOMM_3_WIRE_RAW)
                 return 0;
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index a68c88cdec6..b3cc8b3989a 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -52,8 +52,6 @@
 #include <net/irda/ircomm_tty_attach.h>
 #include <net/irda/ircomm_tty.h>
 
-static int ircomm_tty_install(struct tty_driver *driver,
-                struct tty_struct *tty);
 static int  ircomm_tty_open(struct tty_struct *tty, struct file *filp);
 static void ircomm_tty_close(struct tty_struct * tty, struct file *filp);
 static int  ircomm_tty_write(struct tty_struct * tty,
@@ -84,7 +82,6 @@ static struct tty_driver *driver;
 static hashbin_t *ircomm_tty = NULL;
 
 static const struct tty_operations ops = {
-        .install         = ircomm_tty_install,
         .open            = ircomm_tty_open,
         .close           = ircomm_tty_close,
         .write           = ircomm_tty_write,
@@ -107,35 +104,6 @@ static const struct tty_operations ops = {
 #endif /* CONFIG_PROC_FS */
 };
 
-static void ircomm_port_raise_dtr_rts(struct tty_port *port, int raise)
-{
-        struct ircomm_tty_cb *self = container_of(port, struct ircomm_tty_cb,
-                        port);
-        /*
-         * Here, we use to lock those two guys, but as ircomm_param_request()
-         * does it itself, I don't see the point (and I see the deadlock).
-         * Jean II
-         */
-        if (raise)
-                self->settings.dte |= IRCOMM_RTS | IRCOMM_DTR;
-        else
-                self->settings.dte &= ~(IRCOMM_RTS | IRCOMM_DTR);
-
-        ircomm_param_request(self, IRCOMM_DTE, TRUE);
-}
-
-static int ircomm_port_carrier_raised(struct tty_port *port)
-{
-        struct ircomm_tty_cb *self = container_of(port, struct ircomm_tty_cb,
-                        port);
-        return self->settings.dce & IRCOMM_CD;
-}
-
-static const struct tty_port_operations ircomm_port_ops = {
-        .dtr_rts = ircomm_port_raise_dtr_rts,
-        .carrier_raised = ircomm_port_carrier_raised,
-};
-
 /*
  * Function ircomm_tty_init()
  *
@@ -154,6 +122,7 @@ static int __init ircomm_tty_init(void)
                 return -ENOMEM;
         }
 
+        driver->owner           = THIS_MODULE;
         driver->driver_name     = "ircomm";
         driver->name            = "ircomm";
         driver->major           = IRCOMM_TTY_MAJOR;
@@ -183,7 +152,6 @@ static void __exit __ircomm_tty_cleanup(struct ircomm_tty_cb *self)
         ircomm_tty_shutdown(self);
 
         self->magic = 0;
-        tty_port_destroy(&self->port);
         kfree(self);
 }
 
@@ -227,7 +195,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
         /* Check if already open */
-        if (test_and_set_bit(ASYNCB_INITIALIZED, &self->port.flags)) {
+        if (test_and_set_bit(ASYNC_B_INITIALIZED, &self->flags)) {
                 IRDA_DEBUG(2, "%s(), already open so break out!\n", __func__ );
                 return 0;
         }
@@ -264,7 +232,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
 
         return 0;
 err:
-        clear_bit(ASYNCB_INITIALIZED, &self->port.flags);
+        clear_bit(ASYNC_B_INITIALIZED, &self->flags);
         return ret;
 }
 
@@ -275,62 +243,72 @@ err:
  *
  */
 static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
-                struct tty_struct *tty, struct file *filp)
+                                      struct file *filp)
 {
-        struct tty_port *port = &self->port;
         DECLARE_WAITQUEUE(wait, current);
         int             retval;
         int             do_clocal = 0, extra_count = 0;
         unsigned long   flags;
+        struct tty_struct *tty;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
+        tty = self->tty;
+
         /*
          * If non-blocking mode is set, or the port is not enabled,
          * then make the check up front and then exit.
          */
         if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
                 /* nonblock mode is set or port is not enabled */
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                self->flags |= ASYNC_NORMAL_ACTIVE;
                 IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ );
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL) {
+        if (tty->termios->c_cflag & CLOCAL) {
                 IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __func__ );
                 do_clocal = 1;
         }
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
+         * this loop, self->open_count is dropped by one, so that
          * mgsl_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
 
         retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&self->open_wait, &wait);
 
         IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
-              __FILE__, __LINE__, tty->driver->name, port->count);
+              __FILE__,__LINE__, tty->driver->name, self->open_count );
 
-        spin_lock_irqsave(&port->lock, flags);
+        /* As far as I can see, we protect open_count - Jean II */
+        spin_lock_irqsave(&self->spinlock, flags);
         if (!tty_hung_up_p(filp)) {
                 extra_count = 1;
-                port->count--;
+                self->open_count--;
         }
-        spin_unlock_irqrestore(&port->lock, flags);
-        port->blocked_open++;
+        spin_unlock_irqrestore(&self->spinlock, flags);
+        self->blocked_open++;
 
         while (1) {
-                if (tty->termios.c_cflag & CBAUD)
-                        tty_port_raise_dtr_rts(port);
+                if (tty->termios->c_cflag & CBAUD) {
+                        /* Here, we use to lock those two guys, but
+                         * as ircomm_param_request() does it itself,
+                         * I don't see the point (and I see the deadlock).
+                         * Jean II */
+                        self->settings.dte |= IRCOMM_RTS + IRCOMM_DTR;
+
+                        ircomm_param_request(self, IRCOMM_DTE, TRUE);
+                }
 
                 current->state = TASK_INTERRUPTIBLE;
 
                 if (tty_hung_up_p(filp) ||
-                    !test_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                        retval = (port->flags & ASYNC_HUP_NOTIFY) ?
+                    !test_bit(ASYNC_B_INITIALIZED, &self->flags)) {
+                        retval = (self->flags & ASYNC_HUP_NOTIFY) ?
                                         -EAGAIN : -ERESTARTSYS;
                         break;
                 }
@@ -340,8 +318,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                  * specified, we cannot return before the IrCOMM link is
                  * ready
                  */
-                if (!test_bit(ASYNCB_CLOSING, &port->flags) &&
-                    (do_clocal || tty_port_carrier_raised(port)) &&
+                if (!test_bit(ASYNC_B_CLOSING, &self->flags) &&
+                    (do_clocal || (self->settings.dce & IRCOMM_CD)) &&
                     self->state == IRCOMM_TTY_READY)
                 {
                         break;
@@ -353,36 +331,50 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                 }
 
                 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
-                      __FILE__, __LINE__, tty->driver->name, port->count);
+                      __FILE__,__LINE__, tty->driver->name, self->open_count );
 
                 schedule();
         }
 
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&self->open_wait, &wait);
 
         if (extra_count) {
                 /* ++ is not atomic, so this should be protected - Jean II */
-                spin_lock_irqsave(&port->lock, flags);
-                port->count++;
-                spin_unlock_irqrestore(&port->lock, flags);
+                spin_lock_irqsave(&self->spinlock, flags);
+                self->open_count++;
+                spin_unlock_irqrestore(&self->spinlock, flags);
         }
-        port->blocked_open--;
+        self->blocked_open--;
 
         IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
-              __FILE__, __LINE__, tty->driver->name, port->count);
+              __FILE__,__LINE__, tty->driver->name, self->open_count);
 
         if (!retval)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                self->flags |= ASYNC_NORMAL_ACTIVE;
 
         return retval;
 }
 
-
-static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
+/*
+ * Function ircomm_tty_open (tty, filp)
+ *
+ *    This routine is called when a particular tty device is opened. This
+ *    routine is mandatory; if this routine is not filled in, the attempted
+ *    open will fail with ENODEV.
+ */
+static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
 {
         struct ircomm_tty_cb *self;
-        unsigned int line = tty->index;
+        unsigned int line;
+        unsigned long   flags;
+        int ret;
+
+        IRDA_DEBUG(2, "%s()\n", __func__ );
+
+        line = tty->index;
+        if (line >= IRCOMM_TTY_PORTS)
+                return -ENODEV;
 
         /* Check if instance already exists */
         self = hashbin_lock_find(ircomm_tty, line, NULL);
@@ -394,8 +386,6 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
                         return -ENOMEM;
                 }
 
-                tty_port_init(&self->port);
-                self->port.ops = &ircomm_port_ops;
                 self->magic = IRCOMM_TTY_MAGIC;
                 self->flow = FLOW_STOP;
 
@@ -403,9 +393,13 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
                 INIT_WORK(&self->tqueue, ircomm_tty_do_softint);
                 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;
 
                 /* Init some important stuff */
                 init_timer(&self->watchdog_timer);
+                init_waitqueue_head(&self->open_wait);
+                init_waitqueue_head(&self->close_wait);
                 spin_lock_init(&self->spinlock);
 
                 /*
@@ -415,50 +409,31 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
                  *
                  * Note this is completely usafe and doesn't work properly
                  */
-                tty->termios.c_iflag = 0;
-                tty->termios.c_oflag = 0;
+                tty->termios->c_iflag = 0;
+                tty->termios->c_oflag = 0;
 
                 /* Insert into hash */
                 hashbin_insert(ircomm_tty, (irda_queue_t *) self, line, NULL);
         }
+        /* ++ is not atomic, so this should be protected - Jean II */
+        spin_lock_irqsave(&self->spinlock, flags);
+        self->open_count++;
 
         tty->driver_data = self;
-
-        return tty_port_install(&self->port, driver, tty);
-}
-
-/*
- * Function ircomm_tty_open (tty, filp)
- *
- *    This routine is called when a particular tty device is opened. This
- *    routine is mandatory; if this routine is not filled in, the attempted
- *    open will fail with ENODEV.
- */
-static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
-{
-        struct ircomm_tty_cb *self = tty->driver_data;
-        unsigned long   flags;
-        int ret;
-
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
-        /* ++ is not atomic, so this should be protected - Jean II */
-        spin_lock_irqsave(&self->port.lock, flags);
-        self->port.count++;
-        spin_unlock_irqrestore(&self->port.lock, flags);
-        tty_port_tty_set(&self->port, tty);
+        self->tty = tty;
+        spin_unlock_irqrestore(&self->spinlock, flags);
 
         IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
-                   self->line, self->port.count);
+                   self->line, self->open_count);
 
         /* Not really used by us, but lets do it anyway */
-        tty->low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         /*
          * If the port is the middle of closing, bail out now
          */
         if (tty_hung_up_p(filp) ||
-            test_bit(ASYNCB_CLOSING, &self->port.flags)) {
+            test_bit(ASYNC_B_CLOSING, &self->flags)) {
 
                 /* Hm, why are we blocking on ASYNC_CLOSING if we
                  * do return -EAGAIN/-ERESTARTSYS below anyway?
@@ -468,15 +443,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                  * probably better sleep uninterruptible?
                  */
 
-                if (wait_event_interruptible(self->port.close_wait,
-                                !test_bit(ASYNCB_CLOSING, &self->port.flags))) {
+                if (wait_event_interruptible(self->close_wait, !test_bit(ASYNC_B_CLOSING, &self->flags))) {
                         IRDA_WARNING("%s - got signal while blocking on ASYNC_CLOSING!\n",
                                      __func__);
                         return -ERESTARTSYS;
                 }
 
 #ifdef SERIAL_DO_RESTART
-                return (self->port.flags & ASYNC_HUP_NOTIFY) ?
+                return (self->flags & ASYNC_HUP_NOTIFY) ?
                         -EAGAIN : -ERESTARTSYS;
 #else
                 return -EAGAIN;
@@ -484,7 +458,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         }
 
         /* Check if this is a "normal" ircomm device, or an irlpt device */
-        if (self->line < 0x10) {
+        if (line < 0x10) {
                 self->service_type = IRCOMM_3_WIRE | IRCOMM_9_WIRE;
                 self->settings.service_type = IRCOMM_9_WIRE; /* 9 wire as default */
                 /* Jan Kiszka -> add DSR/RI -> Conform to IrCOMM spec */
@@ -500,7 +474,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         if (ret)
                 return ret;
 
-        ret = ircomm_tty_block_til_ready(self, tty, filp);
+        ret = ircomm_tty_block_til_ready(self, filp);
         if (ret) {
                 IRDA_DEBUG(2,
                       "%s(), returning after block_til_ready with %d\n", __func__ ,
@@ -520,22 +494,81 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
 static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
-        struct tty_port *port = &self->port;
+        unsigned long flags;
 
         IRDA_DEBUG(0, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        if (tty_port_close_start(port, tty, filp) == 0)
+        spin_lock_irqsave(&self->spinlock, flags);
+
+        if (tty_hung_up_p(filp)) {
+                spin_unlock_irqrestore(&self->spinlock, flags);
+
+                IRDA_DEBUG(0, "%s(), returning 1\n", __func__ );
                 return;
+        }
+
+        if ((tty->count == 1) && (self->open_count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  state->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                IRDA_DEBUG(0, "%s(), bad serial port count; "
+                           "tty->count is 1, state->count is %d\n", __func__ ,
+                           self->open_count);
+                self->open_count = 1;
+        }
+
+        if (--self->open_count < 0) {
+                IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
+                           __func__, self->line, self->open_count);
+                self->open_count = 0;
+        }
+        if (self->open_count) {
+                spin_unlock_irqrestore(&self->spinlock, flags);
+
+                IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
+                return;
+        }
+
+        /* Hum... Should be test_and_set_bit ??? - Jean II */
+        set_bit(ASYNC_B_CLOSING, &self->flags);
+
+        /* We need to unlock here (we were unlocking at the end of this
+         * function), because tty_wait_until_sent() may schedule.
+         * I don't know if the rest should be protected somehow,
+         * so someone should check. - Jean II */
+        spin_unlock_irqrestore(&self->spinlock, flags);
+
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify
+         * the line discipline to only process XON/XOFF characters.
+         */
+        tty->closing = 1;
+        if (self->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, self->closing_wait);
 
         ircomm_tty_shutdown(self);
 
         tty_driver_flush_buffer(tty);
+        tty_ldisc_flush(tty);
+
+        tty->closing = 0;
+        self->tty = NULL;
 
-        tty_port_close_end(port, tty);
-        tty_port_tty_set(port, NULL);
+        if (self->blocked_open) {
+                if (self->close_delay)
+                        schedule_timeout_interruptible(self->close_delay);
+                wake_up_interruptible(&self->open_wait);
+        }
+
+        self->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&self->close_wait);
 }
 
 /*
@@ -578,7 +611,7 @@ static void ircomm_tty_do_softint(struct work_struct *work)
         if (!self || self->magic != IRCOMM_TTY_MAGIC)
                 return;
 
-        tty = tty_port_tty_get(&self->port);
+        tty = self->tty;
         if (!tty)
                 return;
 
@@ -599,7 +632,7 @@ static void ircomm_tty_do_softint(struct work_struct *work)
         }
 
         if (tty->hw_stopped)
-                goto put;
+                return;
 
         /* Unlink transmit buffer */
         spin_lock_irqsave(&self->spinlock, flags);
@@ -618,8 +651,6 @@ static void ircomm_tty_do_softint(struct work_struct *work)
 
         /* Check if user (still) wants to be waken up */
         tty_wakeup(tty);
-put:
-        tty_kref_put(tty);
 }
 
 /*
@@ -854,7 +885,7 @@ static void ircomm_tty_throttle(struct tty_struct *tty)
                 ircomm_tty_send_xchar(tty, STOP_CHAR(tty));
 
         /* Hardware flow control? */
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 self->settings.dte &= ~IRCOMM_RTS;
                 self->settings.dte |= IRCOMM_DELTA_RTS;
 
@@ -886,7 +917,7 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
         }
 
         /* Using hardware flow control? */
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS);
 
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
@@ -929,7 +960,7 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
 
         IRDA_DEBUG(0, "%s()\n", __func__ );
 
-        if (!test_and_clear_bit(ASYNCB_INITIALIZED, &self->port.flags))
+        if (!test_and_clear_bit(ASYNC_B_INITIALIZED, &self->flags))
                 return;
 
         ircomm_tty_detach_cable(self);
@@ -968,7 +999,6 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
 static void ircomm_tty_hangup(struct tty_struct *tty)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
-        struct tty_port *port = &self->port;
         unsigned long   flags;
 
         IRDA_DEBUG(0, "%s()\n", __func__ );
@@ -979,17 +1009,14 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
         /* ircomm_tty_flush_buffer(tty); */
         ircomm_tty_shutdown(self);
 
-        spin_lock_irqsave(&port->lock, flags);
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
-        if (port->tty) {
-                set_bit(TTY_IO_ERROR, &port->tty->flags);
-                tty_kref_put(port->tty);
-        }
-        port->tty = NULL;
-        port->count = 0;
-        spin_unlock_irqrestore(&port->lock, flags);
+        /* I guess we need to lock here - Jean II */
+        spin_lock_irqsave(&self->spinlock, flags);
+        self->flags &= ~ASYNC_NORMAL_ACTIVE;
+        self->tty = NULL;
+        self->open_count = 0;
+        spin_unlock_irqrestore(&self->spinlock, flags);
 
-        wake_up_interruptible(&port->open_wait);
+        wake_up_interruptible(&self->open_wait);
 }
 
 /*
@@ -1049,20 +1076,20 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        tty = tty_port_tty_get(&self->port);
+        tty = self->tty;
 
         status = self->settings.dce;
 
         if (status & IRCOMM_DCE_DELTA_ANY) {
                 /*wake_up_interruptible(&self->delta_msr_wait);*/
         }
-        if ((self->port.flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
+        if ((self->flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
                 IRDA_DEBUG(2,
                            "%s(), ircomm%d CD now %s...\n", __func__ , self->line,
                            (status & IRCOMM_CD) ? "on" : "off");
 
                 if (status & IRCOMM_CD) {
-                        wake_up_interruptible(&self->port.open_wait);
+                        wake_up_interruptible(&self->open_wait);
                 } else {
                         IRDA_DEBUG(2,
                                    "%s(), Doing serial hangup..\n", __func__ );
@@ -1070,10 +1097,10 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                                 tty_hangup(tty);
 
                         /* Hangup will remote the tty, so better break out */
-                        goto put;
+                        return;
                 }
         }
-        if (tty && tty_port_cts_enabled(&self->port)) {
+        if (self->flags & ASYNC_CTS_FLOW) {
                 if (tty->hw_stopped) {
                         if (status & IRCOMM_CTS) {
                                 IRDA_DEBUG(2,
@@ -1081,10 +1108,10 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                                 tty->hw_stopped = 0;
 
                                 /* Wake up processes blocked on open */
-                                wake_up_interruptible(&self->port.open_wait);
+                                wake_up_interruptible(&self->open_wait);
 
                                 schedule_work(&self->tqueue);
-                                goto put;
+                                return;
                         }
                 } else {
                         if (!(status & IRCOMM_CTS)) {
@@ -1094,8 +1121,6 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                         }
                 }
         }
-put:
-        tty_kref_put(tty);
 }
 
 /*
@@ -1108,7 +1133,6 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
                                       struct sk_buff *skb)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
-        struct tty_struct *tty;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
@@ -1116,8 +1140,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
         IRDA_ASSERT(skb != NULL, return -1;);
 
-        tty = tty_port_tty_get(&self->port);
-        if (!tty) {
+        if (!self->tty) {
                 IRDA_DEBUG(0, "%s(), no tty!\n", __func__ );
                 return 0;
         }
@@ -1128,7 +1151,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * Devices like WinCE can do this, and since they don't send any
          * params, we can just as well declare the hardware for running.
          */
-        if (tty->hw_stopped && (self->flow == FLOW_START)) {
+        if (self->tty->hw_stopped && (self->flow == FLOW_START)) {
                 IRDA_DEBUG(0, "%s(), polling for line settings!\n", __func__ );
                 ircomm_param_request(self, IRCOMM_POLL, TRUE);
 
@@ -1141,9 +1164,8 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * Use flip buffer functions since the code may be called from interrupt
          * context
          */
-        tty_insert_flip_string(tty, skb->data, skb->len);
-        tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
+        tty_insert_flip_string(self->tty, skb->data, skb->len);
+        tty_flip_buffer_push(self->tty);
 
         /* No need to kfree_skb - see ircomm_ttp_data_indication() */
 
@@ -1194,13 +1216,12 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        tty = tty_port_tty_get(&self->port);
+        tty = self->tty;
 
         switch (cmd) {
         case FLOW_START:
                 IRDA_DEBUG(2, "%s(), hw start!\n", __func__ );
-                if (tty)
-                        tty->hw_stopped = 0;
+                tty->hw_stopped = 0;
 
                 /* ircomm_tty_do_softint will take care of the rest */
                 schedule_work(&self->tqueue);
@@ -1208,19 +1229,15 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
         default:  /* If we get here, something is very wrong, better stop */
         case FLOW_STOP:
                 IRDA_DEBUG(2, "%s(), hw stopped!\n", __func__ );
-                if (tty)
-                        tty->hw_stopped = 1;
+                tty->hw_stopped = 1;
                 break;
         }
-
-        tty_kref_put(tty);
         self->flow = cmd;
 }
 
 #ifdef CONFIG_PROC_FS
 static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
 {
-        struct tty_struct *tty;
         char sep;
 
         seq_printf(m, "State: %s\n", ircomm_tty_state[self->state]);
@@ -1316,43 +1333,40 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
 
         seq_puts(m, "Flags:");
         sep = ' ';
-        if (tty_port_cts_enabled(&self->port)) {
+        if (self->flags & ASYNC_CTS_FLOW) {
                 seq_printf(m, "%cASYNC_CTS_FLOW", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_CHECK_CD) {
+        if (self->flags & ASYNC_CHECK_CD) {
                 seq_printf(m, "%cASYNC_CHECK_CD", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_INITIALIZED) {
+        if (self->flags & ASYNC_INITIALIZED) {
                 seq_printf(m, "%cASYNC_INITIALIZED", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_LOW_LATENCY) {
+        if (self->flags & ASYNC_LOW_LATENCY) {
                 seq_printf(m, "%cASYNC_LOW_LATENCY", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_CLOSING) {
+        if (self->flags & ASYNC_CLOSING) {
                 seq_printf(m, "%cASYNC_CLOSING", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_NORMAL_ACTIVE) {
+        if (self->flags & ASYNC_NORMAL_ACTIVE) {
                 seq_printf(m, "%cASYNC_NORMAL_ACTIVE", sep);
                 sep = '|';
         }
         seq_putc(m, '\n');
 
         seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
-        seq_printf(m, "Open count: %d\n", self->port.count);
+        seq_printf(m, "Open count: %d\n", self->open_count);
         seq_printf(m, "Max data size: %d\n", self->max_data_size);
         seq_printf(m, "Max header size: %d\n", self->max_header_size);
 
-        tty = tty_port_tty_get(&self->port);
-        if (tty) {
+        if (self->tty)
                 seq_printf(m, "Hardware: %s\n",
-                               tty->hw_stopped ? "Stopped" : "Running");
-                tty_kref_put(tty);
-        }
+                               self->tty->hw_stopped ? "Stopped" : "Running");
 }
 
 static int ircomm_tty_proc_show(struct seq_file *m, void *v)
diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index edab393e0c8..b65d66e0d81 100644
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -130,8 +130,6 @@ static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
  */
 int ircomm_tty_attach_cable(struct ircomm_tty_cb *self)
 {
-        struct tty_struct *tty;
-
         IRDA_DEBUG(0, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
@@ -144,11 +142,7 @@ int ircomm_tty_attach_cable(struct ircomm_tty_cb *self)
         }
 
         /* Make sure nobody tries to write before the link is up */
-        tty = tty_port_tty_get(&self->port);
-        if (tty) {
-                tty->hw_stopped = 1;
-                tty_kref_put(tty);
-        }
+        self->tty->hw_stopped = 1;
 
         ircomm_tty_ias_register(self);
 
@@ -404,26 +398,23 @@ void ircomm_tty_disconnect_indication(void *instance, void *sap,
                                       struct sk_buff *skb)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
-        struct tty_struct *tty;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        tty = tty_port_tty_get(&self->port);
-        if (!tty)
+        if (!self->tty)
                 return;
 
         /* This will stop control data transfers */
         self->flow = FLOW_STOP;
 
         /* Stop data transfers */
-        tty->hw_stopped = 1;
+        self->tty->hw_stopped = 1;
 
         ircomm_tty_do_event(self, IRCOMM_TTY_DISCONNECT_INDICATION, NULL,
                             NULL);
-        tty_kref_put(tty);
 }
 
 /*
@@ -559,15 +550,12 @@ void ircomm_tty_connect_indication(void *instance, void *sap,
  */
 void ircomm_tty_link_established(struct ircomm_tty_cb *self)
 {
-        struct tty_struct *tty;
-
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        tty = tty_port_tty_get(&self->port);
-        if (!tty)
+        if (!self->tty)
                 return;
 
         del_timer(&self->watchdog_timer);
@@ -578,22 +566,19 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self)
          * will have to wait for the peer device (DCE) to raise the CTS
          * line.
          */
-        if (tty_port_cts_enabled(&self->port) &&
-                        ((self->settings.dce & IRCOMM_CTS) == 0)) {
+        if ((self->flags & ASYNC_CTS_FLOW) && ((self->settings.dce & IRCOMM_CTS) == 0)) {
                 IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __func__ );
-                goto put;
+                return;
         } else {
                 IRDA_DEBUG(1, "%s(), starting hardware!\n", __func__ );
 
-                tty->hw_stopped = 0;
+                self->tty->hw_stopped = 0;
 
                 /* Wake up processes blocked on open */
-                wake_up_interruptible(&self->port.open_wait);
+                wake_up_interruptible(&self->open_wait);
         }
 
         schedule_work(&self->tqueue);
-put:
-        tty_kref_put(tty);
 }
 
 /*
@@ -992,17 +977,14 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH);
                 ircomm_tty_start_watchdog_timer(self, 3*HZ);
 
-                if (self->port.flags & ASYNC_CHECK_CD) {
+                if (self->flags & ASYNC_CHECK_CD) {
                         /* Drop carrier */
                         self->settings.dce = IRCOMM_DELTA_CD;
                         ircomm_tty_check_modem_status(self);
                 } else {
-                        struct tty_struct *tty = tty_port_tty_get(&self->port);
                         IRDA_DEBUG(0, "%s(), hanging up!\n", __func__ );
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
+                        if (self->tty)
+                                tty_hangup(self->tty);
                 }
                 break;
         default:
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index b343f50dc8d..77c5e6499f8 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -52,18 +52,17 @@
  *    Change speed of the driver. If the remote device is a DCE, then this
  *    should make it change the speed of its serial port
  */
-static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
-                struct tty_struct *tty)
+static void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
 {
-        unsigned int cflag, cval;
+        unsigned cflag, cval;
         int baud;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
-        if (!self->ircomm)
+        if (!self->tty || !self->tty->termios || !self->ircomm)
                 return;
 
-        cflag = tty->termios.c_cflag;
+        cflag = self->tty->termios->c_cflag;
 
         /*  byte size and parity */
         switch (cflag & CSIZE) {
@@ -82,7 +81,7 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
                 cval |= IRCOMM_PARITY_EVEN;
 
         /* Determine divisor based on baud rate */
-        baud = tty_get_baud_rate(tty);
+        baud = tty_get_baud_rate(self->tty);
         if (!baud)
                 baud = 9600;    /* B0 transition handled in rs_set_termios */
 
@@ -91,19 +90,19 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
 
         /* CTS flow control flag and modem status interrupts */
         if (cflag & CRTSCTS) {
-                self->port.flags |= ASYNC_CTS_FLOW;
+                self->flags |= ASYNC_CTS_FLOW;
                 self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
                 /* This got me. Bummer. Jean II */
                 if (self->service_type == IRCOMM_3_WIRE_RAW)
                         IRDA_WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __func__);
         } else {
-                self->port.flags &= ~ASYNC_CTS_FLOW;
+                self->flags &= ~ASYNC_CTS_FLOW;
                 self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
         }
         if (cflag & CLOCAL)
-                self->port.flags &= ~ASYNC_CHECK_CD;
+                self->flags &= ~ASYNC_CHECK_CD;
         else
-                self->port.flags |= ASYNC_CHECK_CD;
+                self->flags |= ASYNC_CHECK_CD;
 #if 0
         /*
          * Set up parity check flag
@@ -149,18 +148,18 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
                             struct ktermios *old_termios)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
-        unsigned int cflag = tty->termios.c_cflag;
+        unsigned int cflag = tty->termios->c_cflag;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
         if ((cflag == old_termios->c_cflag) &&
-            (RELEVANT_IFLAG(tty->termios.c_iflag) ==
+            (RELEVANT_IFLAG(tty->termios->c_iflag) ==
              RELEVANT_IFLAG(old_termios->c_iflag)))
         {
                 return;
         }
 
-        ircomm_tty_change_speed(self, tty);
+        ircomm_tty_change_speed(self);
 
         /* Handle transition to B0 status */
         if ((old_termios->c_cflag & CBAUD) &&
@@ -173,7 +172,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
         if (!(old_termios->c_cflag & CBAUD) &&
             (cflag & CBAUD)) {
                 self->settings.dte |= IRCOMM_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) ||
+                if (!(tty->termios->c_cflag & CRTSCTS) ||
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         self->settings.dte |= IRCOMM_RTS;
                 }
@@ -182,7 +181,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
 
         /* Handle turning off CRTSCTS */
         if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS))
+            !(tty->termios->c_cflag & CRTSCTS))
         {
                 tty->hw_stopped = 0;
                 ircomm_tty_start(tty);
@@ -271,10 +270,10 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
 
         memset(&info, 0, sizeof(info));
         info.line = self->line;
-        info.flags = self->port.flags;
+        info.flags = self->flags;
         info.baud_base = self->settings.data_rate;
-        info.close_delay = self->port.close_delay;
-        info.closing_wait = self->port.closing_wait;
+        info.close_delay = self->close_delay;
+        info.closing_wait = self->closing_wait;
 
         /* For compatibility  */
         info.type = PORT_16550A;
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 14653b8d664..3eca35faf2a 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -42,7 +42,6 @@
 #include <linux/kmod.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include <asm/ioctls.h>
 #include <asm/uaccess.h>
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 42cf1390ce9..ba1a3fc39b5 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -37,6 +37,7 @@
 #include <linux/bitops.h>
 #include <net/arp.h>
 
+#include <asm/system.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 7ac4d1becbf..77911763627 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -40,6 +40,7 @@
 #include <linux/moduleparam.h>
 #include <linux/bitops.h>
 
+#include <asm/system.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>
@@ -66,7 +67,7 @@ static void *ckey;
 static void *skey;
 
 /* Module parameters */
-static bool eth;   /* Use "eth" or "irlan" name for devices */
+static int eth;   /* Use "eth" or "irlan" name for devices */
 static int access = ACCESS_PEER; /* PEER, DIRECT or HOSTED */
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index d14152e866d..e8d5f4405d6 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -50,7 +50,7 @@ static const struct net_device_ops irlan_eth_netdev_ops = {
         .ndo_open               = irlan_eth_open,
         .ndo_stop               = irlan_eth_close,
         .ndo_start_xmit         = irlan_eth_xmit,
-        .ndo_set_rx_mode        = irlan_eth_set_multicast_list,
+        .ndo_set_multicast_list = irlan_eth_set_multicast_list,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
 };
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index 4664855222f..8b61cf0d8a6 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 
+#include <asm/system.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>
@@ -296,7 +297,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
         skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
                         /* Bigger param length comes from CMD_GET_MEDIA_CHAR */
                         IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") +
-                        IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BROADCAST") +
+                        IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BORADCAST") +
                         IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "MULTICAST") +
                         IRLAN_STRING_PARAMETER_LEN("ACCESS_TYPE", "HOSTED"),
                         GFP_ATOMIC);
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 564eb0b8afa..979ecb2435a 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -254,7 +254,7 @@
 #include <linux/init.h>
 
 #include <linux/ppp_defs.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/ppp_channel.h>
 
 #include <net/irda/irda.h>
diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index c3297126928..6c7c4b92e4f 100644
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -100,7 +100,7 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
                 goto err_out;
         }
 
-        hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq,
+        hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
                           &irda_nl_family, 0,  IRDA_NL_CMD_GET_MODE);
         if (hdr == NULL) {
                 ret = -EMSGSIZE;
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index 7152624ed5f..f06947c4fa8 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -523,7 +523,7 @@ void *hashbin_remove_first( hashbin_t *hashbin)
                  * Dequeue the entry...
                  */
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 entry);
+                                 (irda_queue_t*) entry );
                 hashbin->hb_size--;
                 entry->q_next = NULL;
                 entry->q_prev = NULL;
@@ -615,7 +615,7 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
          */
         if ( found ) {
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 entry);
+                                 (irda_queue_t*) entry );
                 hashbin->hb_size--;
 
                 /*
@@ -685,7 +685,7 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
          * Dequeue the entry...
          */
         dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                         entry);
+                         (irda_queue_t*) entry );
         hashbin->hb_size--;
         entry->q_next = NULL;
         entry->q_prev = NULL;
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index de73f6496db..2615ffc8e78 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -235,6 +235,12 @@ static ctl_table irda_table[] = {
         { }
 };
 
+static struct ctl_path irda_path[] = {
+        { .procname = "net", },
+        { .procname = "irda", },
+        { }
+};
+
 static struct ctl_table_header *irda_table_header;
 
 /*
@@ -245,7 +251,7 @@ static struct ctl_table_header *irda_table_header;
  */
 int __init irda_sysctl_register(void)
 {
-        irda_table_header = register_net_sysctl(&init_net, "net/irda", irda_table);
+        irda_table_header = register_sysctl_paths(irda_path, irda_table);
         if (!irda_table_header)
                 return -ENOMEM;
 
@@ -260,7 +266,7 @@ int __init irda_sysctl_register(void)
  */
 void irda_sysctl_unregister(void)
 {
-        unregister_net_sysctl_table(irda_table_header);
+        unregister_sysctl_table(irda_table_header);
 }
 
 
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index ae43c62f904..285ccd623ae 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -29,7 +29,6 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
@@ -440,8 +439,7 @@ struct tsap_cb *irttp_open_tsap(__u8 stsap_sel, int credit, notify_t *notify)
          */
         lsap = irlmp_open_lsap(stsap_sel, &ttp_notify, 0);
         if (lsap == NULL) {
-                IRDA_DEBUG(0, "%s: unable to allocate LSAP!!\n", __func__);
-                __irttp_close_tsap(self);
+                IRDA_WARNING("%s: unable to allocate LSAP!!\n", __func__);
                 return NULL;
         }
 
@@ -1462,12 +1460,14 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance)
         }
 
         /* Allocate a new instance */
-        new = kmemdup(orig, sizeof(struct tsap_cb), GFP_ATOMIC);
+        new = kmalloc(sizeof(struct tsap_cb), GFP_ATOMIC);
         if (!new) {
                 IRDA_DEBUG(0, "%s(), unable to kmalloc\n", __func__);
                 spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags);
                 return NULL;
         }
+        /* Dup */
+        memcpy(new, orig, sizeof(struct tsap_cb));
         spin_lock_init(&new->lock);
 
         /* We don't need the old instance any more */
diff --git a/net/irda/qos.c b/net/irda/qos.c
index 798ffd9a705..4369f7f41bc 100644
--- a/net/irda/qos.c
+++ b/net/irda/qos.c
@@ -30,8 +30,6 @@
  *
  ********************************************************************/
 
-#include <linux/export.h>
-
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>
diff --git a/net/irda/timer.c b/net/irda/timer.c
index 1d552b3946f..f418cb2ad49 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -24,6 +24,7 @@
  *
  ********************************************************************/
 
+#include <asm/system.h>
 #include <linux/delay.h>
 
 #include <net/irda/timer.h>