irnet_ppp: BKL pushdown

[pandora-kernel.git] / net / irda / irnet / irnet.h

diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 873ae18..bccf4d0 100644 (file)
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -241,6 +241,7 @@
 #include <linux/module.h>
 
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
 #include <linux/skbuff.h>
 #include <linux/tty.h>
 #include <linux/proc_fs.h>
@@ -337,27 +338,27 @@
 /* All error messages (will show up in the normal logs) */
 #define DERROR(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_INFO "irnet: %s(): " format, __FUNCTION__ , ##args);}
+               printk(KERN_INFO "irnet: %s(): " format, __func__ , ##args);}
 
 /* Normal debug message (will show up in /var/log/debug) */
 #define DEBUG(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: %s(): " format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: %s(): " format, __func__ , ##args);}
 
 /* Entering a function (trace) */
 #define DENTER(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: -> %s" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: -> %s" format, __func__ , ##args);}
 
 /* Entering and exiting a function in one go (trace) */
 #define DPASS(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: <>%s" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: <>%s" format, __func__ , ##args);}
 
 /* Exiting a function (trace) */
 #define DEXIT(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: <-%s()" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: <-%s()" format, __func__ , ##args);}
 
 /* Exit a function with debug */
 #define DRETURN(ret, dbg, args...) \
@@ -405,7 +406,7 @@ typedef struct irnet_socket
   /* "pppd" interact directly with us on a /dev/ file */
   struct file *                file;           /* File descriptor of this instance */
   /* TTY stuff - to keep "pppd" happy */
-  struct termios       termios;        /* Various tty flags */
+  struct ktermios      termios;        /* Various tty flags */
   /* Stuff for the control channel */
   int                  event_index;    /* Last read in the event log */
 
@@ -419,7 +420,7 @@ typedef struct irnet_socket
   u32                  raccm;          /* to please pppd - dummy) */
   unsigned int         flags;          /* PPP flags (compression, ...) */
   unsigned int         rbits;          /* Unused receive flags ??? */
-
+  struct work_struct disconnect_work;   /* Process context disconnection */
   /* ------------------------ IrTTP part ------------------------ */
   /* We create a pseudo "socket" over the IrDA tranport */
   unsigned long                ttp_open;       /* Set when IrTTP is ready */