diff --git a/src/devices/wifi/amsdu-subframe-header.cc b/src/devices/wifi/amsdu-subframe-header.cc
--- a/src/devices/wifi/amsdu-subframe-header.cc
+++ b/src/devices/wifi/amsdu-subframe-header.cc
@@ -58,7 +58,7 @@
 {
   WriteTo (i, m_da);
   WriteTo (i, m_sa);
-  i.WriteHtonU16 (m_length);
+  i.WriteHtolsbU16 (m_length);
 }
 
 uint32_t
@@ -67,7 +67,7 @@
   Buffer::Iterator i = start;
   ReadFrom (i, m_da);
   ReadFrom (i, m_sa);
-  m_length = i.ReadNtohU16 ();
+  m_length = i.ReadLsbtohU16 ();
   return i.GetDistanceFrom (start);
 }
 
diff --git a/src/devices/wifi/capability-information.cc b/src/devices/wifi/capability-information.cc
--- a/src/devices/wifi/capability-information.cc
+++ b/src/devices/wifi/capability-information.cc
@@ -79,13 +79,13 @@
 Buffer::Iterator 
 CapabilityInformation::Serialize (Buffer::Iterator start) const
 {
-  start.WriteHtonU16 (m_capability);
+  start.WriteHtolsbU16 (m_capability);
   return start;
 }
 Buffer::Iterator 
 CapabilityInformation::Deserialize (Buffer::Iterator start)
 {
-  m_capability = start.ReadNtohU16 ();
+  m_capability = start.ReadLsbtohU16 ();
   return start;
 }
 
diff --git a/src/devices/wifi/mgt-headers.cc b/src/devices/wifi/mgt-headers.cc
--- a/src/devices/wifi/mgt-headers.cc
+++ b/src/devices/wifi/mgt-headers.cc
@@ -193,8 +193,8 @@
   // ibss parameter set
   //XXX
   Buffer::Iterator i = start;
-  i.WriteHtonU64 (Simulator::Now ().GetMicroSeconds ());
-  i.WriteHtonU16 (m_beaconInterval / 1024);
+  i.WriteHtolsbU64 (Simulator::Now ().GetMicroSeconds ());
+  i.WriteHtolsbU16 (m_beaconInterval / 1024);
   i = m_capability.Serialize (i);
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
@@ -204,8 +204,8 @@
 MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)
 {
   Buffer::Iterator i = start;
-  m_timestamp = i.ReadNtohU64();
-  m_beaconInterval = i.ReadNtohU16 ();
+  m_timestamp = i.ReadLsbtohU64();
+  m_beaconInterval = i.ReadLsbtohU16 ();
   m_beaconInterval *= 1024;
   i = m_capability.Deserialize (i);
   i = m_ssid.Deserialize (i);
@@ -292,7 +292,7 @@
 {
   Buffer::Iterator i = start;
   i = m_capability.Serialize (i);
-  i.WriteHtonU16 (m_listenInterval);
+  i.WriteHtolsbU16 (m_listenInterval);
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
 }
@@ -301,7 +301,7 @@
 {
   Buffer::Iterator i = start;
   i = m_capability.Deserialize (i);
-  m_listenInterval = i.ReadNtohU16 ();
+  m_listenInterval = i.ReadLsbtohU16 ();
   i = m_ssid.Deserialize (i);
   i = m_rates.Deserialize (i);
   return i.GetDistanceFrom (start);
@@ -377,7 +377,7 @@
   Buffer::Iterator i = start;
   i = m_capability.Serialize (i);
   i = m_code.Serialize (i);
-  i.WriteHtonU16 (m_aid);
+  i.WriteHtolsbU16 (m_aid);
   i = m_rates.Serialize (i);
 }
 uint32_t
@@ -386,7 +386,7 @@
   Buffer::Iterator i = start;
   i = m_capability.Deserialize (i);
   i = m_code.Deserialize (i);
-  m_aid = i.ReadNtohU16 ();
+  m_aid = i.ReadLsbtohU16 ();
   i = m_rates.Deserialize (i);
   return i.GetDistanceFrom (start);
 }
diff --git a/src/devices/wifi/status-code.cc b/src/devices/wifi/status-code.cc
--- a/src/devices/wifi/status-code.cc
+++ b/src/devices/wifi/status-code.cc
@@ -50,13 +50,13 @@
 Buffer::Iterator 
 StatusCode::Serialize (Buffer::Iterator start) const
 {
-  start.WriteHtonU16 (m_code);
+  start.WriteHtolsbU16 (m_code);
   return start;
 }
 Buffer::Iterator 
 StatusCode::Deserialize (Buffer::Iterator start)
 {
-  m_code = start.ReadNtohU16 ();
+  m_code = start.ReadLsbtohU16 ();
   return start;
 }