--- a/src/devices/wifi/adhoc-wifi-mac.cc	Wed Aug 06 11:37:52 2008 +0100
+++ b/src/devices/wifi/adhoc-wifi-mac.cc	Thu Aug 07 11:14:15 2008 -0700
@@ -168,13 +168,13 @@
 }
 
 void 
-AdhocWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to)
+AdhocWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from)
 {
-  NS_LOG_DEBUG ("enqueue size="<<packet->GetSize ()<<", to="<<to);
+  NS_LOG_FUNCTION (packet->GetSize () << to << from);
   WifiMacHeader hdr;
   hdr.SetType (WIFI_MAC_DATA);
   hdr.SetAddr1 (to);
-  hdr.SetAddr2 (GetAddress ());
+  hdr.SetAddr2 (from);
   hdr.SetAddr3 (GetBssid ());
   hdr.SetDsNotFrom ();
   hdr.SetDsNotTo ();