--- a/src/devices/mesh/dot11s/dot11s-mac-header.cc	Mon Nov 30 18:30:25 2009 -0800
+++ b/src/devices/mesh/dot11s/dot11s-mac-header.cc	Tue Dec 01 15:05:31 2009 +0300
@@ -174,145 +174,5 @@
       && (a.m_meshSeqno == b.m_meshSeqno) && (a.m_addr4 == b.m_addr4) && (a.m_addr5 == b.m_addr5)
       && (a.m_addr6 == b.m_addr6));
 }
-/**********************************************************
- *   ActionFrame
- **********************************************************/
-WifiMeshActionHeader::WifiMeshActionHeader ()
-{
-}
-WifiMeshActionHeader::~WifiMeshActionHeader ()
-{
-}
-void
-WifiMeshActionHeader::SetAction (WifiMeshActionHeader::CategoryValue type,
-    WifiMeshActionHeader::ActionValue action)
-{
-  m_category = type;
-
-  switch (type)
-    {
-  case MESH_PEERING_MGT:
-    {
-      m_actionValue = action.peerLink;
-      break;
-    }
-  case MESH_PATH_SELECTION:
-    {
-      m_actionValue = action.pathSelection;
-      break;
-    }
-  case MESH_LINK_METRIC:
-  case MESH_INTERWORKING:
-  case MESH_RESOURCE_COORDINATION:
-  case MESH_PROXY_FORWARDING:
-    break;
-    }
-}
-WifiMeshActionHeader::CategoryValue
-WifiMeshActionHeader::GetCategory ()
-{
-  switch (m_category)
-    {
-  case MESH_PEERING_MGT:
-    return MESH_PEERING_MGT;
-  case MESH_LINK_METRIC:
-    return MESH_LINK_METRIC;
-  case MESH_PATH_SELECTION:
-    return MESH_PATH_SELECTION;
-  case MESH_INTERWORKING:
-    return MESH_INTERWORKING;
-  case MESH_RESOURCE_COORDINATION:
-    return MESH_RESOURCE_COORDINATION;
-  case MESH_PROXY_FORWARDING:
-    return MESH_PROXY_FORWARDING;
-  default:
-    NS_FATAL_ERROR ("Unknown action value");
-    return MESH_PEERING_MGT;
-    }
-}
-WifiMeshActionHeader::ActionValue
-WifiMeshActionHeader::GetAction ()
-{
-  ActionValue retval;
-  retval.peerLink = PEER_LINK_OPEN; // Needs to be initialized to something to quiet valgrind in default cases
-  switch (m_category)
-    {
-  case MESH_PEERING_MGT:
-    switch (m_actionValue)
-      {
-    case PEER_LINK_OPEN:
-      retval.peerLink = PEER_LINK_OPEN;
-      return retval;
-    case PEER_LINK_CONFIRM:
-      retval.peerLink = PEER_LINK_CONFIRM;
-      return retval;
-    case PEER_LINK_CLOSE:
-      retval.peerLink = PEER_LINK_CLOSE;
-      return retval;
-    default:
-      NS_FATAL_ERROR ("Unknown mesh peering management action code");
-      retval.peerLink = PEER_LINK_OPEN;  /* quiet compiler */
-      return retval;
-      }
-  case MESH_PATH_SELECTION:
-    switch (m_actionValue)
-      {
-    case PATH_SELECTION:
-      retval.pathSelection = PATH_SELECTION;
-      return retval;
-    default:
-      NS_FATAL_ERROR ("Unknown mesh path selection action code");
-      retval.peerLink = PEER_LINK_OPEN;  /* quiet compiler */
-      return retval;
-      }
-  case MESH_LINK_METRIC:
-    // not yet supported
-  case MESH_INTERWORKING:
-    // not yet supported
-  case MESH_RESOURCE_COORDINATION:
-    // not yet supported
-  default:
-    NS_FATAL_ERROR ("Unsupported mesh action");
-    retval.peerLink = PEER_LINK_OPEN;  /* quiet compiler */
-    return retval;
-    }
-}
-TypeId
-WifiMeshActionHeader::GetTypeId ()
-{
-  static TypeId tid = TypeId ("ns3::WifiMeshActionHeader")
-  .SetParent<Header> ()
-  .AddConstructor<WifiMeshActionHeader> ();
-  return tid;
-}
-TypeId
-WifiMeshActionHeader::GetInstanceTypeId () const
-{
-  return GetTypeId ();
-}
-void
-WifiMeshActionHeader::Print (std::ostream &os) const
-{
-}
-uint32_t
-WifiMeshActionHeader::GetSerializedSize () const
-{
-  return 2;
-}
-void
-WifiMeshActionHeader::Serialize (Buffer::Iterator start) const
-{
-  start.WriteU8 (m_category);
-  start.WriteU8 (m_actionValue);
-}
-uint32_t
-WifiMeshActionHeader::Deserialize (Buffer::Iterator start)
-{
-  Buffer::Iterator i = start;
-  m_category = i.ReadU8 ();
-  m_actionValue = i.ReadU8 ();
-  return i.GetDistanceFrom (start);
-}
-
 } //namespace dot11s
 } // namespace ns3