X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FAssociateP.nc;h=d5296c8706a381b63938b8a0005cd43964f1f0bf;hb=2f6d319a8bdf441aae82f42f71183dde482e2d5f;hp=f631f65cb358eb8164bf3ab98be501a56c724a93;hpb=8bdf12e8f4255c53d8121586c39099e9f62a4ad8;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/AssociateP.nc b/tos/lib/mac/tkn154/AssociateP.nc
index f631f65c..d5296c87 100644
--- a/tos/lib/mac/tkn154/AssociateP.nc
+++ b/tos/lib/mac/tkn154/AssociateP.nc
@@ -238,7 +238,9 @@ implementation
     for (i=0; i<MAX_PENDING_ASSOC_RESPONSES;i++)
       if (m_payloadAssocResponse[i][0] == S_IDLE)
         break;    
-    if (i == MAX_PENDING_ASSOC_RESPONSES || !(txFrame = call TxFramePool.get()))
+    if (security && security->SecurityLevel)
+      txStatus = IEEE154_UNSUPPORTED_SECURITY;
+    else if (i == MAX_PENDING_ASSOC_RESPONSES || !(txFrame = call TxFramePool.get()))
       txStatus = IEEE154_TRANSACTION_OVERFLOW;
     else if (!(txControl = call TxControlPool.get())) {
       call TxFramePool.put(txFrame);