ISDN: adapt to task queue changes

Use a tasklet for pushing supervisory frames down the ISDN line and
schedule_task() for flipping ttyI's buffers.

diff --git a/Makefile b/Makefile
index 5a43e133294244b7cc88d805a830e34d700ab742..27abe078613595e3d567e271b1a230fa633f7d86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ ifneq ($(filter all,$(MAKECMDGOALS)),)
   KBUILD_MODULES := 1
 endif
 
-export KBUILD_MODULES KBUILD_BUILTIN
+export KBUILD_MODULES KBUILD_BUILTIN KBUILD_VERBOSE
 
 # Beautify output
 # ---------------------------------------------------------------------------

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 59940572cf7ca776d82387a1f37d1f3223a7df78..7d3b3d8962b4a262e68bd36e8fbb0e7f080ae8a1 100644 (file)
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -164,13 +164,11 @@ isdn_net_dec_frame_cnt(isdn_net_dev *idev)
 {
        atomic_dec(&idev->frame_cnt);
 
-       if (!(isdn_net_device_busy(idev))) {
-               if (!skb_queue_empty(&idev->super_tx_queue)) {
-                       queue_task(&idev->tqueue, &tq_immediate);
-                       mark_bh(IMMEDIATE_BH);
-               } else {
+       if (!isdn_net_device_busy(idev)) {
+               if (!skb_queue_empty(&idev->super_tx_queue))
+                       tasklet_schedule(&idev->tlet);
+               else
                        isdn_net_dev_wake_queue(idev);
-               }
        }                                                                      
 }
 
@@ -858,8 +856,7 @@ isdn_net_write_super(isdn_net_dev *idev, struct sk_buff *skb)
                // we can't grab the lock from irq context, 
                // so we just queue the packet
                skb_queue_tail(&idev->super_tx_queue, skb); 
-               queue_task(&idev->tqueue, &tq_immediate);
-               mark_bh(IMMEDIATE_BH);
+               tasklet_schedule(&idev->tlet);
                return;
        }
 
@@ -872,12 +869,9 @@ isdn_net_write_super(isdn_net_dev *idev, struct sk_buff *skb)
        spin_unlock_bh(&idev->xmit_lock);
 }
 
-/*
- * called from tq_immediate
- */
-static void isdn_net_softint(void *private)
+static void isdn_net_tasklet(unsigned long data)
 {
-       isdn_net_dev *idev = private;
+       isdn_net_dev *idev = (isdn_net_dev *) data;
        struct sk_buff *skb;
 
        spin_lock_bh(&idev->xmit_lock);
@@ -1594,9 +1588,7 @@ isdn_net_new(char *name, struct net_device *master)
        netdev->next = netdev;
        netdev->local.netdev = netdev;
 
-       netdev->tqueue.sync = 0;
-       netdev->tqueue.routine = isdn_net_softint;
-       netdev->tqueue.data = netdev;
+       tasklet_init(&netdev->tlet, isdn_net_tasklet, (unsigned long) netdev);
        spin_lock_init(&netdev->xmit_lock);
 
        netdev->isdn_slot = -1;

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 2e06c1627bd2e3f0c4f60e1929f713ee701531bc..06df5ac87761b333e6a117ed1f4f3faa19ae9fff 100644 (file)
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -101,7 +101,7 @@ isdn_tty_try_read(modem_info * info, struct sk_buff *skb)
 #endif
                                        if (info->emu.mdmreg[REG_CPPP] & BIT_CPPP)
                                                tty->flip.flag_buf_ptr[len - 1] = 0xff;
-                                       queue_task(&tty->flip.tqueue, &tq_timer);
+                                       schedule_task(&tty->flip.tqueue);
                                        kfree_skb(skb);
                                        return 1;
                                }
@@ -153,7 +153,7 @@ isdn_tty_readmodem(void)
                                                        tty->flip.flag_buf_ptr += r;
                                                        tty->flip.char_buf_ptr += r;
                                                        if (r)
-                                                               queue_task(&tty->flip.tqueue, &tq_timer);
+                                                               schedule_task(&tty->flip.tqueue);
                                                        restore_flags(flags);
                                                }
                                        } else
@@ -2498,7 +2498,7 @@ isdn_tty_at_cout(char *msg, modem_info * info)
 
        } else {
                restore_flags(flags);
-               queue_task(&tty->flip.tqueue, &tq_timer);
+               schedule_task(&tty->flip.tqueue);
        }
 }
 

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 4e74989879d3a605f64fc9b9eb3eb2eb8b86fb94..89ab9c70e193b6356ec92b0093f589c1c323e245 100644 (file)
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -399,7 +399,7 @@ typedef struct isdn_net_dev_s {
                                       /* be transmitted asap              */
   atomic_t               frame_cnt;    /* number of frames currently       */
                                       /* queued in HL driver              */
-  struct tq_struct       tqueue;
+  struct tasklet_struct  tlet;
 
   isdn_net_local        *master;       /* Ptr to Master device for slaves  */
   struct isdn_net_dev_s *slave;        /* Ptr to Slave device for masters  */