--- a/src/wifi/model/mgt-headers.cc	Tue Aug 13 10:37:49 2013 -0700
+++ b/src/wifi/model/mgt-headers.cc	Tue Aug 13 22:05:25 2013 -0700
@@ -50,7 +50,17 @@
 {
   m_rates = rates;
 }
+void 
+MgtProbeRequestHeader::SetHtCapabilities(HtCapabilities htcapabilities)
+{
+  m_htCapability=htcapabilities;
+}
 
+HtCapabilities 
+MgtProbeRequestHeader::GetHtCapabilities (void) const
+{
+   return  m_htCapability;
+}
 SupportedRates
 MgtProbeRequestHeader::GetSupportedRates (void) const
 {
@@ -63,6 +73,7 @@
   size += m_ssid.GetSerializedSize ();
   size += m_rates.GetSerializedSize ();
   size += m_rates.extended.GetSerializedSize ();
+  size += m_htCapability.GetSerializedSize();
   return size;
 }
 TypeId
@@ -83,7 +94,8 @@
 MgtProbeRequestHeader::Print (std::ostream &os) const
 {
   os << "ssid=" << m_ssid << ", "
-     << "rates=" << m_rates;
+     << "rates=" << m_rates << ", "
+     << "HT Capabilities=" << m_htCapability;
 }
 void
 MgtProbeRequestHeader::Serialize (Buffer::Iterator start) const
@@ -92,6 +104,7 @@
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
   i = m_rates.extended.Serialize (i);
+   i = m_htCapability.Serialize(i);
 }
 uint32_t
 MgtProbeRequestHeader::Deserialize (Buffer::Iterator start)
@@ -100,6 +113,7 @@
   i = m_ssid.Deserialize (i);
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
+  i = m_htCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
 
@@ -136,7 +150,17 @@
 {
   return m_rates;
 }
+void 
+MgtProbeResponseHeader::SetHtCapabilities(HtCapabilities htcapabilities)
+{
+  m_htCapability=htcapabilities;
+}
 
+HtCapabilities 
+MgtProbeResponseHeader::GetHtCapabilities (void) const
+{
+   return  m_htCapability;
+}
 void
 MgtProbeResponseHeader::SetSsid (Ssid ssid)
 {
@@ -177,6 +201,7 @@
   size += m_rates.GetSerializedSize ();
   //size += 3; // ds parameter set
   size += m_rates.extended.GetSerializedSize ();
+  size += m_htCapability.GetSerializedSize();
   // xxx
   return size;
 }
@@ -184,7 +209,8 @@
 MgtProbeResponseHeader::Print (std::ostream &os) const
 {
   os << "ssid=" << m_ssid << ", "
-     << "rates=" << m_rates;
+     << "rates=" << m_rates << ", "
+     << "HT Capabilities=" << m_htCapability;
 }
 void
 MgtProbeResponseHeader::Serialize (Buffer::Iterator start) const
@@ -207,6 +233,7 @@
   i = m_rates.Serialize (i);
   //i.WriteU8 (0, 3); // ds parameter set.
   i = m_rates.extended.Serialize (i);
+  i = m_htCapability.Serialize(i);
 }
 uint32_t
 MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)
@@ -220,6 +247,7 @@
   i = m_rates.Deserialize (i);
   //i.Next (3); // ds parameter set
   i = m_rates.extended.DeserializeIfPresent (i);
+  i = m_htCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
 
@@ -247,11 +275,21 @@
 {
   m_rates = rates;
 }
+void 
+MgtAssocRequestHeader::SetHtCapabilities(HtCapabilities htcapabilities)
+{
+  m_htCapability = htcapabilities;
+}
 void
 MgtAssocRequestHeader::SetListenInterval (uint16_t interval)
 {
   m_listenInterval = interval;
 }
+HtCapabilities 
+MgtAssocRequestHeader::GetHtCapabilities (void) const
+{
+   return  m_htCapability;
+}
 Ssid
 MgtAssocRequestHeader::GetSsid (void) const
 {
@@ -290,6 +328,7 @@
   size += 2;
   size += m_ssid.GetSerializedSize ();
   size += m_rates.GetSerializedSize ();
+  size += m_htCapability.GetSerializedSize();
   size += m_rates.extended.GetSerializedSize ();
   return size;
 }
@@ -297,7 +336,8 @@
 MgtAssocRequestHeader::Print (std::ostream &os) const
 {
   os << "ssid=" << m_ssid << ", "
-     << "rates=" << m_rates;
+     << "rates=" << m_rates<< ", "
+     << "HT Capabilities=" << m_htCapability;
 }
 void
 MgtAssocRequestHeader::Serialize (Buffer::Iterator start) const
@@ -308,6 +348,7 @@
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
   i = m_rates.extended.Serialize (i);
+  i = m_htCapability.Serialize(i);
 }
 uint32_t
 MgtAssocRequestHeader::Deserialize (Buffer::Iterator start)
@@ -318,6 +359,7 @@
   i = m_ssid.Deserialize (i);
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
+  i = m_htCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
 
@@ -355,7 +397,17 @@
 {
   m_rates = rates;
 }
+void 
+MgtAssocResponseHeader::SetHtCapabilities(HtCapabilities htcapabilities)
+{
+  m_htCapability=htcapabilities;
+}
 
+HtCapabilities 
+MgtAssocResponseHeader::GetHtCapabilities (void) const
+{
+   return  m_htCapability;
+}
 TypeId
 MgtAssocResponseHeader::GetTypeId (void)
 {
@@ -379,6 +431,7 @@
   size += 2; // aid
   size += m_rates.GetSerializedSize ();
   size += m_rates.extended.GetSerializedSize ();
+size += m_htCapability.GetSerializedSize();
   return size;
 }
 
@@ -386,7 +439,8 @@
 MgtAssocResponseHeader::Print (std::ostream &os) const
 {
   os << "status code=" << m_code << ", "
-     << "rates=" << m_rates;
+     << "rates=" << m_rates << ", "
+  << "HT Capabilities=" << m_htCapability;
 }
 void
 MgtAssocResponseHeader::Serialize (Buffer::Iterator start) const
@@ -397,6 +451,7 @@
   i.WriteHtolsbU16 (m_aid);
   i = m_rates.Serialize (i);
   i = m_rates.extended.Serialize (i);
+ i = m_htCapability.Serialize(i);
 }
 uint32_t
 MgtAssocResponseHeader::Deserialize (Buffer::Iterator start)
@@ -407,6 +462,7 @@
   m_aid = i.ReadLsbtohU16 ();
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
+ i = m_htCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
 /**********************************************************