packages/linux/linux-ezx-2.6.20.7/mux-linux-2.6.20.7-fix.patch

   1 diff -pruN linux-2.6.20.7/drivers/char/ts0710.h linux-2.6.20.7_x386/drivers/char/ts0710.h
   2 --- linux-2.6.20.7/drivers/char/ts0710.h        2007-04-22 10:51:23.000000000 +0200
   3 +++ linux-2.6.20.7_x386/drivers/char/ts0710.h   2007-04-22 11:16:37.000000000 +0200
   4 @@ -45,7 +45,7 @@
   5   *  11/18/2002  Modified
   6   */
   7
   8 -#include <linux/config.h>
   9 +//#include <linux/config.h>
  10  #include <linux/module.h>
  11
  12  #include <linux/errno.h>
  13 @@ -58,7 +58,7 @@
  14  #include <linux/major.h>
  15  #include <linux/mm.h>
  16  #include <linux/init.h>
  17 -#include <linux/devfs_fs_kernel.h>
  18 +//#include <linux/devfs_fs_kernel.h>
  19
  20  #include <asm/uaccess.h>
  21  #include <asm/system.h>
  22 diff -pruN linux-2.6.20.7/drivers/char/ts0710_mux.c linux-2.6.20.7_x386/drivers/char/ts0710_mux.c
  23 --- linux-2.6.20.7/drivers/char/ts0710_mux.c    2007-04-22 10:53:05.000000000 +0200
  24 +++ linux-2.6.20.7_x386/drivers/char/ts0710_mux.c       2007-04-22 11:20:07.000000000 +0200
  25 @@ -46,7 +46,7 @@
  26   *  11/18/2002  Second version
  27   *  04/21/2004  Add GPRS PROC
  28   */
  29 -#include <linux/config.h>
  30 +//#include <linux/config.h>
  31  #include <linux/module.h>
  32  #include <linux/types.h>
  33
  34 @@ -70,7 +70,7 @@
  35  #include <linux/mm.h>
  36  #include <linux/slab.h>
  37  #include <linux/init.h>
  38 -#include <linux/devfs_fs_kernel.h>
  39 +//#include <linux/devfs_fs_kernel.h>
  40  //#include <syslog.h>
  41
  42  #include <asm/uaccess.h>
  43 @@ -1894,11 +1894,14 @@ int ts0710_recv_data(ts0710_con * ts0710
  44                                 if (test_bit(TTY_THROTTLED, &tty->flags)) {
  45                                         queue_data = 1;
  46                                 } else {
  47 +                                       /*
  48                                         if (test_bit
  49                                             (TTY_DONT_FLIP, &tty->flags)) {
  50                                                 queue_data = 1;
  51                                                 post_recv = 1;
  52 -                                       } else if (recv_info->total) {
  53 +                                       } else
  54 +                                       */
  55 +                                       if (recv_info->total) {
  56                                                 queue_data = 1;
  57                                                 post_recv = 1;
  58                                         } else if (recv_room < uih_len) {
  59 @@ -3499,11 +3502,14 @@ static void post_recv_worker(void *priva
  60                 if (test_bit(TTY_THROTTLED, &tty->flags)) {
  61                         add_post_recv_queue(&post_recv_q, recv_info);
  62                         continue;
  63 -               } else if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
  64 +               }
  65 +               /*
  66 +               else if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
  67                         post_recv = 1;
  68                         add_post_recv_queue(&post_recv_q, recv_info);
  69                         continue;
  70                 }
  71 +               */
  72
  73                 flow_control = 0;
  74                 recv_packet2 = recv_info->mux_packet;
  75 @@ -3893,9 +3899,9 @@ static int __init mux_init(void)
  76         }
  77         post_recv_count_flag = 0;
  78
  79 -       INIT_WORK(&send_tqueue, send_worker, NULL);
  80 -       INIT_WORK(&receive_tqueue, receive_worker, NULL);
  81 -       INIT_WORK(&post_recv_tqueue, post_recv_worker, NULL);
  82 +       INIT_WORK(&send_tqueue, send_worker);
  83 +       INIT_WORK(&receive_tqueue, receive_worker);
  84 +       INIT_WORK(&post_recv_tqueue, post_recv_worker);
  85
  86         mux_driver = alloc_tty_driver(NR_MUXS);
  87         if (!mux_driver)
  88 @@ -3904,7 +3910,7 @@ static int __init mux_init(void)
  89         mux_driver->owner = THIS_MODULE;
  90         mux_driver->driver_name = "ts0710mux";
  91         mux_driver->name = "mux";
  92 -       mux_driver->devfs_name = "mux";
  93 +       //mux_driver->devfs_name = "mux";
  94         mux_driver->major = TS0710MUX_MAJOR;
  95         mux_driver->minor_start = TS0710MUX_MINOR_START;
  96         mux_driver->type = TTY_DRIVER_TYPE_SERIAL;