--- a/src/devices/wifi/mac-low.cc	Tue Jun 02 19:46:01 2009 +0200
+++ b/src/devices/wifi/mac-low.cc	Wed Jun 03 08:49:40 2009 +0200
@@ -537,7 +537,7 @@
     {
       NS_LOG_DEBUG ("receive cts from="<<m_currentHdr.GetAddr1 ());
       SnrTag tag;
-      packet->FindFirstMatchingTag (tag);
+      packet->RemovePacketTag (tag);
       WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
       station->ReportRxOk (rxSnr, txMode);
       station->ReportRtsOk (rxSnr, txMode, tag.Get ());
@@ -560,7 +560,7 @@
     {
       NS_LOG_DEBUG ("receive ack from="<<m_currentHdr.GetAddr1 ());
       SnrTag tag;
-      packet->FindFirstMatchingTag (tag);
+      packet->RemovePacketTag (tag);
       WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
       station->ReportRxOk (rxSnr, txMode);
       station->ReportDataOk (rxSnr, txMode, tag.Get ());
@@ -1080,7 +1080,7 @@
 
   struct SnrTag tag;
   tag.Set (rtsSnr);
-  packet->AddTag (tag);
+  packet->AddPacketTag (tag);
 
   ForwardDown (packet, &cts, ctsTxMode);
 }
@@ -1159,7 +1159,7 @@
 
   struct SnrTag tag;
   tag.Set (dataSnr);
-  packet->AddTag (tag);
+  packet->AddPacketTag (tag);
 
   ForwardDown (packet, &ack, ackTxMode);
 }