diff -r af9c574246d5 -r eee2eab36748 src/devices/wifi/mac-low.cc
--- a/src/devices/wifi/mac-low.cc	Thu Jun 03 13:34:09 2010 +0200
+++ b/src/devices/wifi/mac-low.cc	Thu Jun 03 17:23:55 2010 +0100
@@ -829,7 +829,7 @@
              data MPDUs with the Ack Policy subfield set to Block Ack, it shall discard
              them and shall send a DELBA frame using the normal access 
              mechanisms. */
-          AccessClass ac = QosUtilsMapTidToAc (hdr.GetQosTid ());
+          AcIndex ac = QosUtilsMapTidToAc (hdr.GetQosTid ());
           m_edcaListeners[ac]->BlockAckInactivityTimeout (hdr.GetAddr2 (), hdr.GetQosTid ());
           return;
         }
@@ -1538,7 +1538,7 @@
       AgreementsI it = m_bAckAgreements.find (std::make_pair (originator, respHdr->GetTid ()));
       Time timeout = MicroSeconds (1024 * agreement.GetTimeout ());
  
-      AccessClass ac = QosUtilsMapTidToAc (agreement.GetTid ());
+      AcIndex ac = QosUtilsMapTidToAc (agreement.GetTid ());
       
       it->second.first.m_inactivityEvent = Simulator::Schedule (timeout,
                                                                 &MacLowBlockAckEventListener::BlockAckInactivityTimeout,
@@ -1846,8 +1846,8 @@
       agreement.m_inactivityEvent.Cancel ();
       Time timeout = MicroSeconds (1024 * agreement.GetTimeout ());
 
-      AccessClass ac = QosUtilsMapTidToAc (agreement.GetTid ());
-      //std::map<AccessClass, MacLowTransmissionListener*>::iterator it = m_edcaListeners.find (ac);
+      AcIndex ac = QosUtilsMapTidToAc (agreement.GetTid ());
+      //std::map<AcIndex, MacLowTransmissionListener*>::iterator it = m_edcaListeners.find (ac);
       //NS_ASSERT (it != m_edcaListeners.end ());
 
       agreement.m_inactivityEvent = Simulator::Schedule (timeout, 
@@ -1859,7 +1859,7 @@
 }
 
 void
-MacLow::RegisterBlockAckListenerForAc (enum AccessClass ac, MacLowBlockAckEventListener *listener)
+MacLow::RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowBlockAckEventListener *listener)
 {
   m_edcaListeners.insert (std::make_pair (ac, listener));
 }