From a316c2ce2669216e37f56e85e026d08c1559881c Mon Sep 17 00:00:00 2001
From: janhauer <janhauer>
Date: Fri, 24 Apr 2009 16:44:55 +0000
Subject: [PATCH] fix by Daniel Santos: for an orphan scan the buffers may be
 empty

---
 tos/lib/mac/tkn154/ScanP.nc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tos/lib/mac/tkn154/ScanP.nc b/tos/lib/mac/tkn154/ScanP.nc
index 21cdfb9e..87db5761 100644
--- a/tos/lib/mac/tkn154/ScanP.nc
+++ b/tos/lib/mac/tkn154/ScanP.nc
@@ -134,10 +134,11 @@ implementation
     } if ((ScanType > 3) || (ScanType < 3 && ScanDuration > 14) || 
           (ChannelPage != IEEE154_SUPPORTED_CHANNELPAGE) ||
           !(supportedChannels & ScanChannels) ||
-          (EnergyDetectListNumEntries && PANDescriptorListNumEntries) ||
+          ((ScanType != ORPHAN_SCAN) &&
+          ((EnergyDetectListNumEntries && PANDescriptorListNumEntries) ||
           (EnergyDetectList != NULL && PANDescriptorList != NULL) ||
           (EnergyDetectListNumEntries && EnergyDetectList == NULL) ||
-          (PANDescriptorListNumEntries && PANDescriptorList == NULL)) {
+          (PANDescriptorListNumEntries && PANDescriptorList == NULL)))) {
       status = IEEE154_INVALID_PARAMETER;
     } else if (ScanType != ENERGY_DETECTION_SCAN &&
         !(m_txFrame = call TxFramePool.get())) { 
-- 
2.39.2