X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FTKN154_MAC.h;h=f7544e0788f10ba20dc533e44bf03380f36a8bf1;hb=9b7c447b3ec7173f2b22fce7452151bf209379f5;hp=20d4e982c4f4c8295ad62c20757697fada13245d;hpb=def99df655317b53b7063f9a8fed333fe873b3fe;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/TKN154_MAC.h b/tos/lib/mac/tkn154/TKN154_MAC.h
index 20d4e982..f7544e07 100644
--- 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