- moved promiscuous mode into separate component

[tinyos-2.x.git] / tos / lib / mac / tkn154 / PibP.nc

diff --git a/tos/lib/mac/tkn154/PibP.nc b/tos/lib/mac/tkn154/PibP.nc
index d3d3b3b96c5a07be15cdb2347f312a9b74c32b14..eb2f9bd0d2cbb7c780112b39dd658f33eb8e3dda 100644 (file)
--- a/tos/lib/mac/tkn154/PibP.nc
+++ b/tos/lib/mac/tkn154/PibP.nc
@@ -175,13 +175,8 @@ implementation
       return IEEE154_INVALID_PARAMETER;
     if (call PromiscuousModeGet.get())
       return IEEE154_TRANSACTION_OVERFLOW; // must first cancel promiscuous mode!
-
-    // nonbeacon-enabled mode is not yet implemented!
-    if (PANType != BEACON_ENABLED_PAN)
-      return IEEE154_INVALID_PARAMETER;
-
     m_setDefaultPIB = SetDefaultPIB;
-    m_panType = PANType; // TODO: set this later?
+    m_panType = PANType; 
     if (!call Token.isOwner())
       call Token.request();
     return IEEE154_SUCCESS;
@@ -560,7 +555,6 @@ implementation
 
   command void Packet.clear(message_t* msg)
   {
-    uint8_t i;
     memset(msg->header, 0, sizeof(message_header_t));
     memset(msg->metadata, 0, sizeof(message_metadata_t));
   }