View | Details | Raw Unified | Return to bug 2584
Collapse All | Expand All

(-)a/src/wifi/model/dca-txop.cc (+4 lines)
 Lines 127-132    Link Here 
127 
  {
 127 
  {
128 
    m_txop->EndTxNoAck ();
 128 
    m_txop->EndTxNoAck ();
129 
  }
 129 
  }
130 
  virtual bool HasTxop (void)
131 
  {
132 
    return false;
133 
  }
130 

          134
          

        

        

          131
          
private:

          135
          
private:

        

        

          132
          
  DcaTxop *m_txop;

          136
          
  DcaTxop *m_txop;

        



(-)a/src/wifi/model/edca-txop-n.cc
      (+4 lines)




  

    

    

       Lines 135-140
       
    
  Link Here 
    

  

        

          135
          
  {

          135
          
  {

        

        

          136
          
    m_txop->EndTxNoAck ();

          136
          
    m_txop->EndTxNoAck ();

        

        

          137
          
  }

          137
          
  }

        

            

              
              
              138
              
  virtual bool HasTxop (void)

            

            

              139
              
  {

            

            

              140
              
    return m_txop->HasTxop ();

            

            

              141
              
  }

            

        

          138
          
  virtual Ptr<WifiMacQueue> GetQueue (void)

          142
          
  virtual Ptr<WifiMacQueue> GetQueue (void)

        

        

          139
          
  {

          143
          
  {

        

        

          140
          
    return m_txop->GetEdcaQueue ();

          144
          
    return m_txop->GetEdcaQueue ();

        



(-)a/src/wifi/model/mac-low.cc
      (-1 / +1 lines)




  

    

    

       Lines 998-1004
       
    
  Link Here 
    

  

        

          998
          
          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

          998
          
          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

        

        

          999
          
                                                 &MacLow::WaitSifsAfterEndTxFragment, this);

          999
          
                                                 &MacLow::WaitSifsAfterEndTxFragment, this);

        

        

          1000
          
        }

          1000
          
        }

        

          
            

              1001
              
      else if (m_currentHdr.IsQosData () && !m_ampdu)


              1001
              
      else if (m_currentHdr.IsQosData () && !m_ampdu && m_listener->HasTxop ())

            

        

          1002
          
        {

          1002
          
        {

        

        

          1003
          
          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

          1003
          
          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

        

        

          1004
          
                                                 &MacLow::WaitSifsAfterEndTx, this);

          1004
          
                                                 &MacLow::WaitSifsAfterEndTx, this);

        



(-)a/src/wifi/model/mac-low.h
      (+4 lines)




  

    

    

       Lines 130-135
       
    
  Link Here 
    

  

        

          130
          
   *

          130
          
   *

        

        

          131
          
   */

          131
          
   */

        

        

          132
          
  virtual void EndTxNoAck (void) = 0;

          132
          
  virtual void EndTxNoAck (void) = 0;

        

            

              
              
              133
              
  /**

            

            

              134
              
   * Returns whether it has TXOP granted for the next MPDU

            

            

              135
              
   */

            

            

              136
              
  virtual bool HasTxop (void) = 0;

            

        

          133
          
};

          137
          
};

        

        

          134
          

          138
          

        

        

          135
          

          139
          

        






  

  Return to bug 2584