|
|
| 153 |
EdcaTxopN::NeedsAccess (void) const |
153 |
EdcaTxopN::NeedsAccess (void) const |
| 154 |
{ |
154 |
{ |
| 155 |
NS_LOG_FUNCTION (this); |
155 |
NS_LOG_FUNCTION (this); |
| 156 |
return m_queue->HasPackets () || m_currentPacket != 0 || m_baManager->HasPackets (); |
156 |
return !m_queue->IsEmpty () || m_currentPacket != 0 || m_baManager->HasPackets (); |
| 157 |
} |
157 |
} |
| 158 |
|
158 |
|
| 159 |
uint16_t EdcaTxopN::GetNextSequenceNumberFor (WifiMacHeader *hdr) |
159 |
uint16_t EdcaTxopN::GetNextSequenceNumberFor (WifiMacHeader *hdr) |
|
Lines 186-192
EdcaTxopN::NotifyAccessGranted (void)
|
Link Here
|
|---|
|
| 186 |
m_startTxop = Simulator::Now (); |
186 |
m_startTxop = Simulator::Now (); |
| 187 |
if (m_currentPacket == 0) |
187 |
if (m_currentPacket == 0) |
| 188 |
{ |
188 |
{ |
| 189 |
if (!m_queue->HasPackets () && !m_baManager->HasPackets ()) |
189 |
if (m_queue->IsEmpty () && !m_baManager->HasPackets ()) |
| 190 |
{ |
190 |
{ |
| 191 |
NS_LOG_DEBUG ("queue is empty"); |
191 |
NS_LOG_DEBUG ("queue is empty"); |
| 192 |
return; |
192 |
return; |
|
Lines 724-730
EdcaTxopN::RestartAccessIfNeeded (void)
|
Link Here
|
|---|
|
| 724 |
{ |
724 |
{ |
| 725 |
NS_LOG_FUNCTION (this); |
725 |
NS_LOG_FUNCTION (this); |
| 726 |
if ((m_currentPacket != 0 |
726 |
if ((m_currentPacket != 0 |
| 727 |
|| m_queue->HasPackets () || m_baManager->HasPackets ()) |
727 |
|| !m_queue->IsEmpty () || m_baManager->HasPackets ()) |
| 728 |
&& !m_dcf->IsAccessRequested ()) |
728 |
&& !m_dcf->IsAccessRequested ()) |
| 729 |
{ |
729 |
{ |
| 730 |
Ptr<const Packet> packet; |
730 |
Ptr<const Packet> packet; |
|
Lines 765-771
EdcaTxopN::StartAccessIfNeeded (void)
|
Link Here
|
|---|
|
| 765 |
{ |
765 |
{ |
| 766 |
//NS_LOG_FUNCTION (this); |
766 |
//NS_LOG_FUNCTION (this); |
| 767 |
if (m_currentPacket == 0 |
767 |
if (m_currentPacket == 0 |
| 768 |
&& (m_queue->HasPackets () || m_baManager->HasPackets ()) |
768 |
&& (!m_queue->IsEmpty () || m_baManager->HasPackets ()) |
| 769 |
&& !m_dcf->IsAccessRequested ()) |
769 |
&& !m_dcf->IsAccessRequested ()) |
| 770 |
{ |
770 |
{ |
| 771 |
Ptr<const Packet> packet; |
771 |
Ptr<const Packet> packet; |