From be39dbec1f44eb2bf7fb0c048c8ee22fecfcc444 Mon Sep 17 00:00:00 2001
From: Simon Pickartz <pickartz@lfbs.rwth-aachen.de>
Date: Sat, 27 Aug 2011 02:43:06 -0700
Subject: [PATCH] change in iRCCE_mailbox_close

---
 arch/x86/scc/iRCCE_mailbox.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/x86/scc/iRCCE_mailbox.c b/arch/x86/scc/iRCCE_mailbox.c
index 4fb439fa..a0521317 100644
--- a/arch/x86/scc/iRCCE_mailbox.c
+++ b/arch/x86/scc/iRCCE_mailbox.c
@@ -413,9 +413,6 @@ int iRCCE_mail_send(
 		RC_cache_invalidate();
 	}
 
-	/* disable interrupts */
-//	flags = irq_nested_disable();
-
 	// check if mailbox is closed
 	RCCE_acquire_lock( dest );
 	RC_cache_invalidate();
@@ -439,8 +436,6 @@ int iRCCE_mail_send(
 	iRCCE_memcpy_put( (void*)iRCCE_mailbox_send[dest],
 			(void*)&header, RCCE_LINE_SIZE );
 
-	RC_cache_invalidate();
-	
 	// set senders flag
 	RC_cache_invalidate();
 	iRCCE_mailbox_send[dest]->sent = RCCE_FLAG_SET;
@@ -521,10 +516,7 @@ int iRCCE_mailbox_flush(void) {
 	for( i=0; i<iRCCE_PRIOS; ++i ) {
 		iRCCE_MAIL_HEADER* erase_header = 
 			iRCCE_mailbox_recv_queue[i].first;
-		
-		/* disable interrupts */
-		flags = irq_nested_disable();
-		
+
 		while( erase_header != NULL ) {
 			iRCCE_mailbox_recv_queue[i].first = 
 				iRCCE_mailbox_recv_queue[i].first->next;
@@ -577,13 +569,12 @@ static int iRCCE_mailbox_close_one(int rank, int check) {
 	iRCCE_memcpy_put( (void*)iRCCE_mailbox_recv[rank], 
 			&help_header, RCCE_LINE_SIZE );
 	
-	iRCCE_mailbox_status[rank] = iRCCE_MAILBOX_CLOSED;
-	
 	/* enable interrupts */
 	irq_nested_enable(flags);
 
 	RCCE_release_lock( RCCE_IAM );	
 
+	iRCCE_mailbox_status[rank] = iRCCE_MAILBOX_CLOSED;
 
 	return iRCCE_SUCCESS;
 }