X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/42be8a4481c24e1b264eebff45813963e3c34ba8..c29d86ce91159cc6ddcb4266903f0aafe9992e01:/lincan/src/can_quekern.c

diff --git a/lincan/src/can_quekern.c b/lincan/src/can_quekern.c
index 093886c..5089e5c 100644
--- a/lincan/src/can_quekern.c
+++ b/lincan/src/can_quekern.c
@@ -15,14 +15,14 @@
 extern atomic_t edge_num_cnt;
 
 #ifdef CAN_DEBUG
-	#define DEBUGQUE(fmt,args...) can_printk(KERN_ERR "can_queue (debug): " fmt,\
+	#define DEBUGQUE(fmt,args...) can_printk(KERN_ERR "can_quekern (debug): " fmt,\
 	##args)
 
 #else
 	#define DEBUGQUE(fmt,args...)
 #endif
 
-#define ERRMSGQUE(fmt,args...) can_printk(KERN_ERR "can_queue: " fmt,\
+#define ERRMSGQUE(fmt,args...) can_printk(KERN_ERR "can_quekern: " fmt,\
 	##args)
 
 
@@ -128,6 +128,27 @@ void canque_edge_do_dead(struct canque_edge_t *edge, int dead_fl)
 	
 	if(dead_fl) return;
 	
+	canque_notify_bothends(edge,CANQUEUE_NOTIFY_NOUSR);
+    #ifdef CAN_WITH_RTL
+	/* The problem of the above call is, that in RT-Linux to Linux notify
+	   case is edge scheduled for delayed notify delivery, this needs
+	   to be reflected there */
+	if(atomic_read(&edge->edge_used)>0){
+		can_spin_lock_irqsave(&edge->inends->ends_lock, flags);
+		can_spin_lock(&edge->outends->ends_lock);
+		if(atomic_read(&edge->edge_used)>0){
+			/* left edge to live for a while, banshee comes again in a while */
+			canque_fifo_clear_fl(&edge->fifo,DEAD);
+			can_spin_unlock(&edge->outends->ends_lock);
+			can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags);
+			can_printk(KERN_ERR "can_quertl (debug): canque_edge_do_dead postponed\n");
+			return;
+		}
+		can_spin_unlock(&edge->outends->ends_lock);
+		can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags);
+	}
+    #endif /*CAN_WITH_RTL*/
+	
 	if(canqueue_disconnect_edge(edge)<0){
 		ERRMSGQUE("canque_edge_do_dead: canqueue_disconnect_edge failed !!!\n");
 		return;