diff -crB stats/wifi-example-apps.cc stats2/wifi-example-apps.cc
*** stats/wifi-example-apps.cc	2009-04-09 23:21:29.000000000 +0200
--- stats2/wifi-example-apps.cc	2009-05-20 18:01:43.000000000 +0200
***************
*** 250,262 ****
      }
  
      TimestampTag timestamp;
!     packet->FindFirstMatchingTag(timestamp);
!     Time tx = timestamp.GetTimestamp();
! 
!     if (m_delay != 0) {
!       m_delay->Update(Simulator::Now() - tx);
      }
! 
      if (m_calc != 0) {
        m_calc->Update();
      }
--- 250,266 ----
      }
  
      TimestampTag timestamp;
!     if( packet->FindFirstMatchingTag(timestamp) ) {
!       Time tx = timestamp.GetTimestamp();
!       
!       if (m_delay != 0) {
!         m_delay->Update(Simulator::Now() - tx);
!       }
      }
!     else {
!       NS_LOG_INFO ("** missing time tag **");
!     }
!     
      if (m_calc != 0) {
        m_calc->Update();
      }
diff -crB stats/wifi-example-sim.cc stats2/wifi-example-sim.cc
*** stats/wifi-example-sim.cc	2009-04-25 01:46:06.000000000 +0200
--- stats2/wifi-example-sim.cc	2009-05-20 18:02:25.000000000 +0200
***************
*** 201,207 ****
    Ptr<CounterCalculator<uint32_t> > totalTx =
      CreateObject<CounterCalculator<uint32_t> >();
    totalTx->SetKey("wifi-tx-frames");
!   Config::Connect("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/Tx",
                    MakeBoundCallback(&TxCallback, totalTx));
    data.AddDataCalculator(totalTx);
  
--- 201,207 ----
    Ptr<CounterCalculator<uint32_t> > totalTx =
      CreateObject<CounterCalculator<uint32_t> >();
    totalTx->SetKey("wifi-tx-frames");
!   Config::Connect("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/Mac/MacTx",
                    MakeBoundCallback(&TxCallback, totalTx));
    data.AddDataCalculator(totalTx);
  
***************
*** 212,218 ****
    Ptr<PacketCounterCalculator> totalRx =
      CreateObject<PacketCounterCalculator>();
    totalRx->SetKey("wifi-rx-frames");
!   Config::Connect("/NodeList/1/DeviceList/*/$ns3::WifiNetDevice/Rx",
                    MakeCallback(&PacketCounterCalculator::FrameUpdate,
                                      totalRx));
    data.AddDataCalculator(totalRx);
--- 212,218 ----
    Ptr<PacketCounterCalculator> totalRx =
      CreateObject<PacketCounterCalculator>();
    totalRx->SetKey("wifi-rx-frames");
!   Config::Connect("/NodeList/1/DeviceList/*/$ns3::WifiNetDevice/Mac/MacRx",
                    MakeCallback(&PacketCounterCalculator::FrameUpdate,
                                      totalRx));
    data.AddDataCalculator(totalRx);