Header-files cleanup and CAN queue edges and ends locking reimplemented.

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

diff --git a/lincan/src/close.c b/lincan/src/close.c
index b1146be6a45aae584523b78f921616372f40673b..c42869e147355cd3f48b3f554736136b75431e9d 100644 (file)
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -7,24 +7,16 @@
  * Version lincan-0.2  9 Jul 2003
  */
 
-#define __NO_VERSION__
-#include <linux/module.h> 
-
-#include <linux/autoconf.h>
-
-#include <linux/fs.h>
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
-#include <linux/malloc.h>
-#else
-#include <linux/slab.h>
-#endif
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/close.h"
 #include "../include/i82527.h"
 #include "../include/setup.h"
 
+#define __NO_VERSION__
+#include <linux/module.h>
+
 int can_close(struct inode *inode, struct file *file)
 {
        struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
@@ -40,9 +32,8 @@ int can_close(struct inode *inode, struct file *file)
        qends = canuser->qends;
 
        list_del(&canuser->peers);
-       canqueue_ends_done_kern(qends, 1);
        canuser->qends = NULL;
-       kfree(qends);
+       canqueue_ends_dispose_kern(qends, file->f_flags & O_SYNC);
 
        kfree(canuser);