The first enhanced version of Linux CAN-bus driver for OCERA project

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

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index 0f54c866f01c2f915290a417bbd1c148ece44f74..ec029abc62b90181492eeb410a16f9a61625ea66 100644 (file)
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -16,6 +16,7 @@
 
 #include <linux/fs.h>
 #include <linux/version.h>
+#include <linux/string.h>
 
 #include "../include/main.h"
 #include "../include/ioctl.h"
@@ -81,7 +82,7 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
                        fifo->rx_size= MAX_BUF_LENGTH * sizeof(struct canmsg_t);
                        fifo->tx_size = fifo->rx_size;
 
-                       #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,2,19))
+                       #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0))
                                init_waitqueue(&fifo->readq);
                                init_waitqueue(&fifo->writeq);
                        #else
@@ -92,8 +93,6 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
                        fifo->rx_in_progress = 0;
                        fifo->tx_in_progress = 0;
 
-                       fifo->head = fifo->tail = 0; //TEMP!!
-                       
                        break;
                }