# HG changeset patch
# User Lalith Suresh <suresh.lalith@gmail.com>
# Date 1310883257 -19800
# Node ID 4cbcbe42aaa63b0887f04929579ca6dab04cb707
# Parent  0ac15aa6350847f865774ccd486ec9550acd3ec3
Add WifiMacHeader in MonitorWifiMac itself

diff -r 0ac15aa63508 -r 4cbcbe42aaa6 src/wifi/model/mac-low.cc
--- a/src/wifi/model/mac-low.cc	Sun Jul 17 11:32:05 2011 +0530
+++ b/src/wifi/model/mac-low.cc	Sun Jul 17 11:44:17 2011 +0530
@@ -677,15 +677,7 @@
    * packet queue.
    */
   WifiMacHeader hdr;
-
-  if (!m_monitorMode)
-    {
-      packet->RemoveHeader (hdr);
-    }
-  else
-    {
-      packet->Copy ()->RemoveHeader (hdr);
-    }
+  packet->RemoveHeader (hdr);
   m_currentRadiotapHdr = &radiotaphdr;
 
   bool isPrevNavZero = IsNavZero ();
diff -r 0ac15aa63508 -r 4cbcbe42aaa6 src/wifi/model/monitor-wifi-mac.cc
--- a/src/wifi/model/monitor-wifi-mac.cc	Sun Jul 17 11:32:05 2011 +0530
+++ b/src/wifi/model/monitor-wifi-mac.cc	Sun Jul 17 11:44:17 2011 +0530
@@ -372,6 +372,7 @@
   Mac48Address to = hdr->GetAddr1 ();
   Mac48Address from = hdr->GetAddr2 ();
   NS_LOG_DEBUG ("Received packet to: " << to << " from: " << from << " at:" << m_low->GetAddress ());
+  packet->AddHeader (*hdr);
   packet->AddHeader (*radiotaphdr);
   ForwardUp (packet, from, to);
 }