Added support for local message processing and some cleanups.

[lincan.git] / lincan / src / read.c

diff --git a/lincan/src/read.c b/lincan/src/read.c
index 64b24155723cd1ecdc92bc13c9933a9de15e750b..b1798974bc43c948b7185a7fefe67e6e267dbdf5 100644 (file)
--- a/lincan/src/read.c
+++ b/lincan/src/read.c
@@ -98,11 +98,7 @@ inline ssize_t can_rtr_read(struct chip_t *chip, struct msgobj_t *obj,
                new_rtr_entry=(struct rtr_id *)kmalloc(sizeof(struct rtr_id),GFP_ATOMIC);
                rtr_current->next=new_rtr_entry;
        }
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0))
-       init_waitqueue(&new_rtr_entry->rtr_wq);
-#else
        init_waitqueue_head(&new_rtr_entry->rtr_wq);
-#endif
        new_rtr_entry->id = read_msg.id;
        new_rtr_entry->rtr_message = &read_msg;
        new_rtr_entry->next=NULL;
@@ -156,11 +152,6 @@ ssize_t can_read(struct file *file, char *buffer, size_t length, loff_t *offset)
                DEBUGMSG("this will always return zero.\n");
                return 0;
        }
-       if (length > 8 * sizeof(struct canmsg_t)) {
-               DEBUGMSG("Reading more than 8 CAN messages, this is not supported.\n");
-               DEBUGMSG("Defaulting to 8 messages.\n");
-               length = 8 * sizeof(struct canmsg_t);
-       }
        /* Initialize hardware pointers */
        obj = canuser->msgobj;
        if (obj == NULL) {