bugfix: radio token was not properly transferred when MLME_SCAN/_RX_ENABLE was called...

[tinyos-2.x.git] / tos / lib / mac / tkn154 / TKN154_MAC.h

diff --git a/tos/lib/mac/tkn154/TKN154_MAC.h b/tos/lib/mac/tkn154/TKN154_MAC.h
index 20d4e982c4f4c8295ad62c20757697fada13245d..f7544e0788f10ba20dc533e44bf03380f36a8bf1 100644 (file)
--- a/tos/lib/mac/tkn154/TKN154_MAC.h
+++ b/tos/lib/mac/tkn154/TKN154_MAC.h
@@ -283,7 +283,7 @@ enum {
 typedef bool token_requested_t __attribute__((combine(rcombine)));
 token_requested_t rcombine(token_requested_t r1, token_requested_t r2)
 {
-  return r1 && r2;
+  return r1 || r2;
 }
 
 #ifdef TKN154_DEBUG