1.1 --- a/src/devices/mesh/dot11s/hwmp-protocol.cc	Fri Oct 23 15:34:14 2009 +0400
     1.2 +++ b/src/devices/mesh/dot11s/hwmp-protocol.cc	Fri Oct 23 16:22:56 2009 +0400
     1.3 @@ -763,7 +763,7 @@
     1.4  void
     1.5  HwmpProtocol::InitiatePathError(PathError perr)
     1.6  {
     1.7 -  for (HwmpProtocolMacMap::const_iterator i =  m_interfaces.begin (); i != m_interfaces.end (); i ++)
     1.8 +  for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
     1.9    {
    1.10      std::vector<Mac48Address> receivers_for_interface;
    1.11      for (unsigned int j = 0; j < perr.receivers.size (); j ++)
    1.12 @@ -779,7 +779,7 @@
    1.13  void
    1.14  HwmpProtocol::ForwardPathError(PathError perr)
    1.15  {
    1.16 -  for (HwmpProtocolMacMap::const_iterator i =  m_interfaces.begin (); i != m_interfaces.end (); i ++)
    1.17 +  for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
    1.18    {
    1.19      std::vector<Mac48Address> receivers_for_interface;
    1.20      for (unsigned int j = 0; j < perr.receivers.size (); j ++)
    1.21 @@ -896,7 +896,7 @@
    1.22  HwmpProtocol::ReactivePathResolved (Mac48Address dst)
    1.23  {
    1.24    std::map<Mac48Address, PreqEvent>::iterator i = m_preqTimeouts.find (dst);
    1.25 -  if (i !=  m_preqTimeouts.end ())
    1.26 +  if (i != m_preqTimeouts.end ())
    1.27      {
    1.28        m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled);
    1.29      }
    1.30 @@ -985,7 +985,7 @@
    1.31            packet = DequeueFirstPacketByDst (dst);
    1.32          }
    1.33        std::map<Mac48Address, PreqEvent>::iterator i = m_preqTimeouts.find (dst);
    1.34 -      NS_ASSERT (i !=  m_preqTimeouts.end ());
    1.35 +      NS_ASSERT (i != m_preqTimeouts.end ());
    1.36        m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled);
    1.37        m_preqTimeouts.erase (i);
    1.38        return;

     2.1 --- a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc	Fri Oct 23 15:34:14 2009 +0400
     2.2 +++ b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc	Fri Oct 23 16:22:56 2009 +0400
     2.3 @@ -77,9 +77,7 @@
     2.4    return m_neighbours;
     2.5  }
     2.6  void
     2.7 -IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, //MicroSeconds!
     2.8 -    Time beacon_interval //MicroSeconds!
     2.9 -)
    2.10 +IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, Time beacon_interval)
    2.11  {
    2.12    if (m_numOfUnits == 50)
    2.13      {

     3.1 --- a/src/devices/mesh/dot11s/peer-management-protocol.cc	Fri Oct 23 15:34:14 2009 +0400
     3.2 +++ b/src/devices/mesh/dot11s/peer-management-protocol.cc	Fri Oct 23 16:22:56 2009 +0400
     3.3 @@ -400,7 +400,7 @@
     3.4                continue;
     3.5              }
     3.6            //Beacon interval is stored in TU's
     3.7 -          if (((*j)->GetBeaconInterval ()) != TimeToTu(beaconInterval->second))
     3.8 +          if (((*j)->GetBeaconInterval ()) != TimeToTu (beaconInterval->second))
     3.9              {
    3.10                continue;
    3.11              }