Merge remote-tracking branch 'origin' into RCA

yq-koh · May 11, 2018 · f5ab86e · f5ab86e
2 parents cea4559 + b8fb6a6
commit f5ab86e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/scratch/test/s1g-test-tim-raw.cc b/scratch/test/s1g-test-tim-raw.cc
@@ -242,7 +242,10 @@ void checkRawAndTimConfiguration (void)
 	// Number of TIM groups in a single page has to equal number of different RPS elements because
 	// If #TIM > #RPS, the same RPS will be used in more than 1 TIM and that is wrong because
 	// each TIM can accommodate different AIDs (same RPS means same stations in RAWs)
+    if(config.pageSliceCount)
+    {
 	NS_ASSERT (config.pageSliceCount == config.rps.rpsset.size());
+    }
 	for (uint32_t j = 0; j < config.rps.rpsset.size(); j++)
 	{
 		uint32_t totalRawTime = 0;

diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
@@ -1021,6 +1021,10 @@ ApWifiMac::SendOneBeacon (void)
 			// Standard 10.47 page 325-326
 		}
 	}
+  else if (m_pageslice.GetPageSliceCount () == 0 && numPagedStas == 0)
+   {
+      m_PageSliceNum = 0;
+   }
 
     uint8_t NumEncodedBlock;
     if (m_PageSliceNum != (m_pageslice.GetPageSliceCount() - 1) && m_PageSliceNum != 31) // convenient overflow if count==0