]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
Revert change r171 since kv can now handle these other comparison ops.
authorthuermann <thuermann@030b6a49-0b11-0410-94ab-b0dab22257f2>
Wed, 7 Mar 2007 14:29:02 +0000 (14:29 +0000)
committerthuermann <thuermann@030b6a49-0b11-0410-94ab-b0dab22257f2>
Wed, 7 Mar 2007 14:29:02 +0000 (14:29 +0000)
git-svn-id: svn://svn.berlios.de//socketcan/trunk@175 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/slcan.c

index 5d196bce4b4ce5f1d2eb9301af05cb3a80cfb4f0..5206aed895706e44ff671e4cd0a3c76d966626d9 100644 (file)
@@ -500,8 +500,7 @@ static void slc_setup(struct net_device *dev)
  * Routines looking at TTY side.
  ******************************************/
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 static int slcan_receive_room(struct tty_struct *tty)
 {
        return 65536;  /* We can handle an infinite amount of data. :-) */
@@ -707,8 +706,7 @@ static int slcan_open(struct tty_struct *tty)
        sl->line = tty_devnum(tty);
        sl->pid = current->pid;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
        /* FIXME: already done before we were called - seems this can go */
        if (tty->driver->flush_buffer)
                tty->driver->flush_buffer(tty);
@@ -825,8 +823,7 @@ static struct tty_ldisc     slc_ldisc = {
        .close          = slcan_close,
        .ioctl          = slcan_ioctl,
        .receive_buf    = slcan_receive_buf,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
        .receive_room   = slcan_receive_room,
 #endif
        .write_wakeup   = slcan_write_wakeup,