Merge revert ns-3.7-RC3
authorFaker Moatamri <faker.moatamri@sophia.inria.fr>
Tue, 12 Jan 2010 17:17:40 +0100
changeset 5907892efc87a151
parent 5905 2792b4b2e255
parent 5906 509b5089a081
child 5908 be7ee94b8f79
Merge revert
     1.1 --- a/src/devices/mesh/mesh-wifi-interface-mac.cc	Tue Jan 12 17:15:23 2010 +0100
     1.2 +++ b/src/devices/mesh/mesh-wifi-interface-mac.cc	Tue Jan 12 17:17:40 2010 +0100
     1.3 @@ -720,16 +720,6 @@
     1.4  {
     1.5    m_txErrCallback (hdr);
     1.6  }
     1.7 -void
     1.8 -MeshWifiInterfaceMac::DoStart ()
     1.9 -{
    1.10 -  m_beaconDca->Start ();
    1.11 -  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); i ++)
    1.12 -  {
    1.13 -    i->second->Start ();
    1.14 -  }
    1.15 -  WifiMac::DoStart ();
    1.16 -}
    1.17  
    1.18  void 
    1.19  MeshWifiInterfaceMac::FinishConfigureStandard (enum WifiPhyStandard standard)
     2.1 --- a/src/devices/mesh/mesh-wifi-interface-mac.h	Tue Jan 12 17:15:23 2010 +0100
     2.2 +++ b/src/devices/mesh/mesh-wifi-interface-mac.h	Tue Jan 12 17:17:40 2010 +0100
     2.3 @@ -179,8 +179,6 @@
     2.4    bool GetBeaconGeneration () const;
     2.5    /// Real d-tor
     2.6    virtual void DoDispose ();
     2.7 -  ///Initiator at t=0
     2.8 -  void DoStart ();
     2.9  
    2.10  private:
    2.11    typedef std::map<AccessClass, Ptr<DcaTxop> > Queues;
     3.1 --- a/src/devices/wifi/adhoc-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
     3.2 +++ b/src/devices/wifi/adhoc-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
     3.3 @@ -298,11 +298,4 @@
     3.4  {
     3.5    m_txErrCallback (hdr);
     3.6  }
     3.7 -void
     3.8 -AdhocWifiMac::DoStart ()
     3.9 -{
    3.10 -  m_dca->Start ();
    3.11 -  WifiMac::DoStart ();
    3.12 -}
    3.13 -
    3.14  } // namespace ns3
     4.1 --- a/src/devices/wifi/adhoc-wifi-mac.h	Tue Jan 12 17:15:23 2010 +0100
     4.2 +++ b/src/devices/wifi/adhoc-wifi-mac.h	Tue Jan 12 17:17:40 2010 +0100
     4.3 @@ -82,7 +82,6 @@
     4.4  private:
     4.5    // inherited from Object base class.
     4.6    virtual void DoDispose (void);
     4.7 -  void DoStart ();
     4.8    /* invoked by the MacLows. */
     4.9    void ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr);
    4.10    AdhocWifiMac (const AdhocWifiMac & ctor_arg);
     5.1 --- a/src/devices/wifi/dca-txop.cc	Tue Jan 12 17:15:23 2010 +0100
     5.2 +++ b/src/devices/wifi/dca-txop.cc	Tue Jan 12 17:17:40 2010 +0100
     5.3 @@ -268,13 +268,6 @@
     5.4    return m_low;
     5.5  }
     5.6  
     5.7 -void
     5.8 -DcaTxop::DoStart ()
     5.9 -{
    5.10 -  m_dcf->ResetCw ();
    5.11 -  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
    5.12 -  ns3::Dcf::DoStart ();
    5.13 -}
    5.14  bool
    5.15  DcaTxop::NeedRts (Ptr<const Packet> packet)
    5.16  {
     6.1 --- a/src/devices/wifi/dca-txop.h	Tue Jan 12 17:15:23 2010 +0100
     6.2 +++ b/src/devices/wifi/dca-txop.h	Tue Jan 12 17:17:40 2010 +0100
     6.3 @@ -121,7 +121,7 @@
     6.4  
     6.5    // Inherited from ns3::Object
     6.6    Ptr<MacLow> Low (void);
     6.7 -  void DoStart ();
     6.8 +
     6.9    /* dcf notifications forwarded here */
    6.10    bool NeedsAccess (void) const;
    6.11    void NotifyAccessGranted (void);
     7.1 --- a/src/devices/wifi/edca-txop-n.cc	Tue Jan 12 17:15:23 2010 +0100
     7.2 +++ b/src/devices/wifi/edca-txop-n.cc	Tue Jan 12 17:17:40 2010 +0100
     7.3 @@ -686,11 +686,5 @@
     7.4  {
     7.5    m_aggregator = aggr;
     7.6  }
     7.7 -void
     7.8 -EdcaTxopN::DoStart ()
     7.9 -{
    7.10 -  m_dcf->ResetCw ();
    7.11 -  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
    7.12 -  ns3::Dcf::DoStart ();
    7.13 -}
    7.14 +
    7.15  } //namespace ns3
     8.1 --- a/src/devices/wifi/edca-txop-n.h	Tue Jan 12 17:15:23 2010 +0100
     8.2 +++ b/src/devices/wifi/edca-txop-n.h	Tue Jan 12 17:17:40 2010 +0100
     8.3 @@ -132,7 +132,6 @@
     8.4    void SetMsduAggregator (Ptr<MsduAggregator> aggr);
     8.5  
     8.6  private:
     8.7 -  void DoStart ();
     8.8    /**
     8.9     * This functions are used only to correctly set addresses in a-msdu subframe.
    8.10     * If aggregating sta is a STA (in an infrastructured network):
     9.1 --- a/src/devices/wifi/nqap-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
     9.2 +++ b/src/devices/wifi/nqap-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
     9.3 @@ -606,8 +606,6 @@
     9.4      {
     9.5        m_beaconEvent = Simulator::ScheduleNow (&NqapWifiMac::SendOneBeacon, this);
     9.6      }
     9.7 -  m_dca->Start ();
     9.8 -  m_beaconDca->Start ();
     9.9    WifiMac::DoStart ();
    9.10  }
    9.11  
    10.1 --- a/src/devices/wifi/nqsta-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
    10.2 +++ b/src/devices/wifi/nqsta-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
    10.3 @@ -686,10 +686,5 @@
    10.4        break;
    10.5      }
    10.6  }
    10.7 -void
    10.8 -NqstaWifiMac::DoStart ()
    10.9 -{
   10.10 -  m_dca->Start ();
   10.11 -  WifiMac::DoStart ();
   10.12 -}
   10.13 +
   10.14  } // namespace ns3
    11.1 --- a/src/devices/wifi/nqsta-wifi-mac.h	Tue Jan 12 17:15:23 2010 +0100
    11.2 +++ b/src/devices/wifi/nqsta-wifi-mac.h	Tue Jan 12 17:17:40 2010 +0100
    11.3 @@ -119,7 +119,6 @@
    11.4      BEACON_MISSED,
    11.5      REFUSED
    11.6    };
    11.7 -  void DoStart ();
    11.8    void SetBssid (Mac48Address bssid);
    11.9    void SetActiveProbing (bool enable);
   11.10    bool GetActiveProbing (void) const;
    12.1 --- a/src/devices/wifi/qadhoc-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
    12.2 +++ b/src/devices/wifi/qadhoc-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
    12.3 @@ -108,6 +108,10 @@
    12.4    m_dcfManager = 0;
    12.5    m_low = 0;
    12.6    m_phy = 0;
    12.7 +  m_voEdca = 0;
    12.8 +  m_viEdca = 0;
    12.9 +  m_beEdca = 0;
   12.10 +  m_bkEdca = 0;
   12.11    m_stationManager = 0;
   12.12    for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
   12.13      {
   12.14 @@ -441,14 +445,5 @@
   12.15        break;
   12.16      }
   12.17  }
   12.18 -void
   12.19 -QadhocWifiMac::DoStart ()
   12.20 -{
   12.21 -  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
   12.22 -    {
   12.23 -      i->second->Start ();
   12.24 -    }
   12.25 -  WifiMac::DoStart ();
   12.26 -}
   12.27  
   12.28  } //namespace ns3
    13.1 --- a/src/devices/wifi/qadhoc-wifi-mac.h	Tue Jan 12 17:15:23 2010 +0100
    13.2 +++ b/src/devices/wifi/qadhoc-wifi-mac.h	Tue Jan 12 17:17:40 2010 +0100
    13.3 @@ -78,7 +78,6 @@
    13.4  private:
    13.5    Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
    13.6    virtual void DoDispose (void);
    13.7 -  void DoStart ();
    13.8    void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
    13.9    void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   13.10    QadhocWifiMac &operator = (const QadhocWifiMac &);
   13.11 @@ -102,6 +101,10 @@
   13.12    Ptr<EdcaTxopN> GetBKQueue (void) const;
   13.13  
   13.14    Queues m_queues;
   13.15 +  Ptr<EdcaTxopN> m_voEdca;
   13.16 +  Ptr<EdcaTxopN> m_viEdca;
   13.17 +  Ptr<EdcaTxopN> m_beEdca;
   13.18 +  Ptr<EdcaTxopN> m_bkEdca;
   13.19    Ptr<MacLow> m_low;
   13.20    Ptr<WifiPhy> m_phy;
   13.21    Ptr<WifiRemoteStationManager> m_stationManager;
    14.1 --- a/src/devices/wifi/qap-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
    14.2 +++ b/src/devices/wifi/qap-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
    14.3 @@ -791,11 +791,6 @@
    14.4  void
    14.5  QapWifiMac::DoStart (void)
    14.6  {
    14.7 -  m_beaconDca->Start ();
    14.8 -  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
    14.9 -    {
   14.10 -      i->second->Start ();
   14.11 -    }
   14.12    m_beaconEvent.Cancel ();
   14.13    if (m_enableBeaconGeneration)
   14.14      {
    15.1 --- a/src/devices/wifi/qsta-wifi-mac.cc	Tue Jan 12 17:15:23 2010 +0100
    15.2 +++ b/src/devices/wifi/qsta-wifi-mac.cc	Tue Jan 12 17:17:40 2010 +0100
    15.3 @@ -775,13 +775,5 @@
    15.4      }
    15.5  }
    15.6  
    15.7 -void
    15.8 -QstaWifiMac::DoStart ()
    15.9 -{
   15.10 -  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
   15.11 -    {
   15.12 -      i->second->Start ();
   15.13 -    }
   15.14 -  WifiMac::DoStart ();
   15.15 -}
   15.16 +
   15.17  }  //namespace ns3
    16.1 --- a/src/devices/wifi/qsta-wifi-mac.h	Tue Jan 12 17:15:23 2010 +0100
    16.2 +++ b/src/devices/wifi/qsta-wifi-mac.h	Tue Jan 12 17:17:40 2010 +0100
    16.3 @@ -87,7 +87,6 @@
    16.4    void StartActiveAssociation (void);
    16.5  
    16.6  private:
    16.7 -  void DoStart ();
    16.8    void SetBssid (Mac48Address bssid);
    16.9    Mac48Address GetBroadcastBssid (void);
   16.10    void Receive (Ptr<Packet> p, const WifiMacHeader *hdr);