--- a/src/devices/wifi/qap-wifi-mac.h	Thu Aug 13 13:39:23 2009 +0200
+++ b/src/devices/wifi/qap-wifi-mac.h	Fri Aug 14 12:21:39 2009 +0200
@@ -87,6 +87,10 @@
   void StartBeaconing (void);
 
 private:
+  typedef std::map<AccessClass, Ptr<EdcaTxopN> > Queues;
+  typedef std::list<std::pair<Ptr<Packet>, AmsduSubframeHeader> > DeaggregatedMsdus;
+  typedef std::list<std::pair<Ptr<Packet>, AmsduSubframeHeader> >::const_iterator DeaggregatedMsdusCI;
+  
   virtual void DoDispose (void);
   void Receive (Ptr<Packet> packet, WifiMacHeader const*hdr);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
@@ -107,28 +111,15 @@
   QapWifiMac &operator = (const QapWifiMac &);
   QapWifiMac (const QapWifiMac &);
 
-  typedef std::map<AccessClass, Ptr<EdcaTxopN> > Queues;
-  typedef std::list<std::pair<Ptr<Packet>, AmsduSubframeHeader> > DeaggregatedMsdus;
-  typedef std::list<std::pair<Ptr<Packet>, AmsduSubframeHeader> >::const_iterator DeaggregatedMsdusCI;
-
-  Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
-  
   Ptr<EdcaTxopN> GetVOQueue (void) const;
   Ptr<EdcaTxopN> GetVIQueue (void) const;
   Ptr<EdcaTxopN> GetBEQueue (void) const;
   Ptr<EdcaTxopN> GetBKQueue (void) const;
-
-  void SetVOQueue (Ptr<EdcaTxopN> voQueue);
-  void SetVIQueue (Ptr<EdcaTxopN> viQueue);
-  void SetBEQueue (Ptr<EdcaTxopN> beQueue);
-  void SetBKQueue (Ptr<EdcaTxopN> bkQueue);
+  void SetQueue (enum AccessClass ac);
 
-  /*Next map is used only for an esay access to a specific queue*/
+  virtual void FinishConfigureStandard (enum WifiPhyStandard standard);
+
   Queues m_queues;
-  Ptr<EdcaTxopN> m_voEdca;
-  Ptr<EdcaTxopN> m_viEdca;
-  Ptr<EdcaTxopN> m_beEdca;
-  Ptr<EdcaTxopN> m_bkEdca;
   Ptr<DcaTxop> m_beaconDca;
   Ptr<MacLow> m_low;
   Ptr<WifiPhy> m_phy;
@@ -139,6 +130,7 @@
   Ssid m_ssid;
   EventId m_beaconEvent;
   Time m_beaconInterval;
+  Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
 };
 
 }  //namespace ns3