--- a/src/devices/wifi/wifi-mac-header.cc	Mon Aug 24 18:31:59 2009 -0700
+++ b/src/devices/wifi/wifi-mac-header.cc	Mon Aug 24 19:03:58 2009 -0700
@@ -896,9 +896,9 @@
 void 
 WifiMacHeader::PrintFrameControl (std::ostream &os) const
 {
-  os << "ToDS=" << m_ctrlToDs << ", FromDS=" << m_ctrlFromDs 
-     << ", MoreFrag=" << m_ctrlMoreFrag << ", Retry=" << m_ctrlRetry 
-     << ", MoreData=" << m_ctrlMoreData 
+  os << "ToDS=" << std::hex << (int) m_ctrlToDs << ", FromDS=" << std::hex << (int) m_ctrlFromDs 
+     << ", MoreFrag=" <<  std::hex << (int) m_ctrlMoreFrag << ", Retry=" << std::hex << (int) m_ctrlRetry 
+     << ", MoreData=" <<  std::hex << (int) m_ctrlMoreData << std::dec 
     ;
 }
 
@@ -935,7 +935,7 @@
       PrintFrameControl (os);
       os << " Duration/ID=" << m_duration << "us"
          << ", DA=" << m_addr1 << ", SA=" << m_addr2
-         << ", BSSID=" << m_addr3 << ", FragNumber=" << m_seqFrag
+         << ", BSSID=" << m_addr3 << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec
          << ", SeqNumber=" << m_seqSeq;
       break;
     case WIFI_MAC_MGT_ACTION:
@@ -943,11 +943,11 @@
       PrintFrameControl (os);
       os << " Duration/ID=" << m_duration << "us"
          << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3
-         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
+         << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec << ", SeqNumber=" << m_seqSeq;
     case WIFI_MAC_MGT_MULTIHOP_ACTION:
       os << " Duration/ID=" << m_duration << "us"
          << "RA=" << m_addr1 << ", TA=" << m_addr2 << ", DA=" << m_addr3
-         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
+         << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec << ", SeqNumber=" << m_seqSeq;
     case WIFI_MAC_DATA:
       PrintFrameControl (os);
       os << " Duration/ID=" << m_duration << "us";
@@ -971,7 +971,7 @@
         {
           NS_FATAL_ERROR ("Impossible ToDs and FromDs flags combination");
         }
-      os << ", FragNumber=" << m_seqFrag
+      os << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec
          << ", SeqNumber=" << m_seqSeq;
       break;
     case WIFI_MAC_DATA_CFACK: