--- a/src/devices/mesh/mesh-wifi-interface-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/mesh/mesh-wifi-interface-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -720,16 +720,6 @@
{
m_txErrCallback (hdr);
}
-void
-MeshWifiInterfaceMac::DoStart ()
-{
- m_beaconDca->Start ();
- for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); i ++)
- {
- i->second->Start ();
- }
- WifiMac::DoStart ();
-}
void
MeshWifiInterfaceMac::FinishConfigureStandard (enum WifiPhyStandard standard)
--- a/src/devices/mesh/mesh-wifi-interface-mac.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/mesh/mesh-wifi-interface-mac.h Tue Jan 12 17:17:40 2010 +0100
@@ -179,8 +179,6 @@
bool GetBeaconGeneration () const;
/// Real d-tor
virtual void DoDispose ();
- ///Initiator at t=0
- void DoStart ();
private:
typedef std::map<AccessClass, Ptr<DcaTxop> > Queues;
--- a/src/devices/wifi/adhoc-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/adhoc-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -298,11 +298,4 @@
{
m_txErrCallback (hdr);
}
-void
-AdhocWifiMac::DoStart ()
-{
- m_dca->Start ();
- WifiMac::DoStart ();
-}
-
} // namespace ns3
--- a/src/devices/wifi/adhoc-wifi-mac.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/adhoc-wifi-mac.h Tue Jan 12 17:17:40 2010 +0100
@@ -82,7 +82,6 @@
private:
// inherited from Object base class.
virtual void DoDispose (void);
- void DoStart ();
/* invoked by the MacLows. */
void ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr);
AdhocWifiMac (const AdhocWifiMac & ctor_arg);
--- a/src/devices/wifi/dca-txop.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/dca-txop.cc Tue Jan 12 17:17:40 2010 +0100
@@ -268,13 +268,6 @@
return m_low;
}
-void
-DcaTxop::DoStart ()
-{
- m_dcf->ResetCw ();
- m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
- ns3::Dcf::DoStart ();
-}
bool
DcaTxop::NeedRts (Ptr<const Packet> packet)
{
--- a/src/devices/wifi/dca-txop.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/dca-txop.h Tue Jan 12 17:17:40 2010 +0100
@@ -121,7 +121,7 @@
// Inherited from ns3::Object
Ptr<MacLow> Low (void);
- void DoStart ();
+
/* dcf notifications forwarded here */
bool NeedsAccess (void) const;
void NotifyAccessGranted (void);
--- a/src/devices/wifi/edca-txop-n.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/edca-txop-n.cc Tue Jan 12 17:17:40 2010 +0100
@@ -686,11 +686,5 @@
{
m_aggregator = aggr;
}
-void
-EdcaTxopN::DoStart ()
-{
- m_dcf->ResetCw ();
- m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
- ns3::Dcf::DoStart ();
-}
+
} //namespace ns3
--- a/src/devices/wifi/edca-txop-n.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/edca-txop-n.h Tue Jan 12 17:17:40 2010 +0100
@@ -132,7 +132,6 @@
void SetMsduAggregator (Ptr<MsduAggregator> aggr);
private:
- void DoStart ();
/**
* This functions are used only to correctly set addresses in a-msdu subframe.
* If aggregating sta is a STA (in an infrastructured network):
--- a/src/devices/wifi/nqap-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/nqap-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -606,8 +606,6 @@
{
m_beaconEvent = Simulator::ScheduleNow (&NqapWifiMac::SendOneBeacon, this);
}
- m_dca->Start ();
- m_beaconDca->Start ();
WifiMac::DoStart ();
}
--- a/src/devices/wifi/nqsta-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/nqsta-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -686,10 +686,5 @@
break;
}
}
-void
-NqstaWifiMac::DoStart ()
-{
- m_dca->Start ();
- WifiMac::DoStart ();
-}
+
} // namespace ns3
--- a/src/devices/wifi/nqsta-wifi-mac.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/nqsta-wifi-mac.h Tue Jan 12 17:17:40 2010 +0100
@@ -119,7 +119,6 @@
BEACON_MISSED,
REFUSED
};
- void DoStart ();
void SetBssid (Mac48Address bssid);
void SetActiveProbing (bool enable);
bool GetActiveProbing (void) const;
--- a/src/devices/wifi/qadhoc-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/qadhoc-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -108,6 +108,10 @@
m_dcfManager = 0;
m_low = 0;
m_phy = 0;
+ m_voEdca = 0;
+ m_viEdca = 0;
+ m_beEdca = 0;
+ m_bkEdca = 0;
m_stationManager = 0;
for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
{
@@ -441,14 +445,5 @@
break;
}
}
-void
-QadhocWifiMac::DoStart ()
-{
- for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
- {
- i->second->Start ();
- }
- WifiMac::DoStart ();
-}
} //namespace ns3
--- a/src/devices/wifi/qadhoc-wifi-mac.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/qadhoc-wifi-mac.h Tue Jan 12 17:17:40 2010 +0100
@@ -78,7 +78,6 @@
private:
Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
virtual void DoDispose (void);
- void DoStart ();
void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
QadhocWifiMac &operator = (const QadhocWifiMac &);
@@ -102,6 +101,10 @@
Ptr<EdcaTxopN> GetBKQueue (void) const;
Queues m_queues;
+ Ptr<EdcaTxopN> m_voEdca;
+ Ptr<EdcaTxopN> m_viEdca;
+ Ptr<EdcaTxopN> m_beEdca;
+ Ptr<EdcaTxopN> m_bkEdca;
Ptr<MacLow> m_low;
Ptr<WifiPhy> m_phy;
Ptr<WifiRemoteStationManager> m_stationManager;
--- a/src/devices/wifi/qap-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/qap-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -791,11 +791,6 @@
void
QapWifiMac::DoStart (void)
{
- m_beaconDca->Start ();
- for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
- {
- i->second->Start ();
- }
m_beaconEvent.Cancel ();
if (m_enableBeaconGeneration)
{
--- a/src/devices/wifi/qsta-wifi-mac.cc Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/qsta-wifi-mac.cc Tue Jan 12 17:17:40 2010 +0100
@@ -775,13 +775,5 @@
}
}
-void
-QstaWifiMac::DoStart ()
-{
- for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
- {
- i->second->Start ();
- }
- WifiMac::DoStart ();
-}
+
} //namespace ns3
--- a/src/devices/wifi/qsta-wifi-mac.h Tue Jan 12 17:15:23 2010 +0100
+++ b/src/devices/wifi/qsta-wifi-mac.h Tue Jan 12 17:17:40 2010 +0100
@@ -87,7 +87,6 @@
void StartActiveAssociation (void);
private:
- void DoStart ();
void SetBssid (Mac48Address bssid);
Mac48Address GetBroadcastBssid (void);
void Receive (Ptr<Packet> p, const WifiMacHeader *hdr);