From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Sat, 25 Jul 2015 20:54:51 +0000 (+0200)
Subject: Update remote request code prototype to compile with latest kernels.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/d48f5ffafaa5a383c5fdfc7cdd83bb90d14a124c

Update remote request code prototype to compile with latest kernels.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---

diff --git a/lincan/include/main.h b/lincan/include/main.h
index 5b4e0e0..663f81f 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -397,6 +397,7 @@ struct mem_addr {
 /* Structure for the RTR queue */
 struct rtr_id {
 	unsigned long id;
+	int ready_fl;
 	struct canmsg_t *rtr_message;
 	wait_queue_head_t rtr_wq;
 	struct rtr_id *next;
diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index 635dfc7..6445f5d 100644
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -750,6 +750,7 @@ void i82527_irq_rtr_handler(struct canchip_t *chip, struct msgobj_t *obj,
 
 	can_spin_unlock(&hardware_p->rtr_lock);
 
+	rtr_search->ready_fl = 1;
 	if (waitqueue_active(&rtr_search->rtr_wq))
 		wake_up(&rtr_search->rtr_wq);
 }
diff --git a/lincan/src/ioctl_remote.c b/lincan/src/ioctl_remote.c
index 5ba89f8..8c3dd77 100644
--- a/lincan/src/ioctl_remote.c
+++ b/lincan/src/ioctl_remote.c
@@ -46,6 +46,7 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
 	struct rtr_id *rtr_current, *new_rtr_entry;
 	struct msgobj_t *obj;
 	struct canchip_t *chip;
+	int err;
 	/*struct canque_ends_t *qends;*/
 
 	DEBUGMSG("Remote transmission request\n");
@@ -84,6 +85,7 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
 	}
 	init_waitqueue_head(&new_rtr_entry->rtr_wq);
 	new_rtr_entry->id = rtr_id;
+	new_rtr_entry->ready_fl = 0;
 	new_rtr_entry->rtr_message = rtr_msg;
 	new_rtr_entry->next=NULL;
 
@@ -92,7 +94,8 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
 	/* Send remote transmission request */
 	chip->chipspecops->remote_request(chip,obj);
 	obj->ret = 0;
-	interruptible_sleep_on(&new_rtr_entry->rtr_wq);
+
+	err = wait_event_interruptible(new_rtr_entry->rtr_wq, new_rtr_entry->ready_fl);
 
 	can_spin_lock_irqsave(&hardware_p->rtr_lock, flags);
 	if (hardware_p->rtr_queue == new_rtr_entry) {
@@ -113,6 +116,9 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
 	can_spin_unlock_irqrestore(&hardware_p->rtr_lock, flags);
 	kfree(new_rtr_entry);
 
+	if (err)
+		return -EINTR;
+
 	return obj->ret;
 }