From c76261da0749b2f93ee1a425baa4cc36ce2e1bef Mon Sep 17 00:00:00 2001
From: Alex Mikheev <alexm@mellanox.com>
Date: Tue, 16 Dec 2014 16:34:42 +0200
Subject: [PATCH] OSHMEM: atomic mxm: fix mkey conversion

Correctly return mxm_empty_mem_key when shmem mkey is empty
---
 oshmem/mca/atomic/mxm/atomic_mxm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oshmem/mca/atomic/mxm/atomic_mxm.h b/oshmem/mca/atomic/mxm/atomic_mxm.h
index 8c35e4db67..ff4edd6eed 100644
--- a/oshmem/mca/atomic/mxm/atomic_mxm.h
+++ b/oshmem/mca/atomic/mxm/atomic_mxm.h
@@ -66,7 +66,7 @@ END_C_DECLS
 static inline mxm_mem_key_t *to_mxm_mkey(sshmem_mkey_t *mkey) {
 
     if (0 == mkey->len) {
-        return MXM_INVALID_MEM_HANDLE;
+        return &mxm_empty_mem_key;
     }
     return (mxm_mem_key_t *)mkey->u.data;
 }