--- a/src/wifi/model/sta-wifi-mac.cc	Fri May 06 13:21:20 2011 -0700
+++ b/src/wifi/model/sta-wifi-mac.cc	Sat May 07 21:49:46 2011 +0200
@@ -211,7 +211,8 @@
 StaWifiMac::TryToEnsureAssociated (void)
 {
   NS_LOG_FUNCTION (this);
-  switch (m_state) {
+  switch (m_state)
+    {
     case ASSOCIATED:
       return;
       break;
@@ -283,8 +284,8 @@
 {
   NS_LOG_FUNCTION (this << delay);
   m_beaconWatchdogEnd = std::max (Simulator::Now () + delay, m_beaconWatchdogEnd);
-  if (Simulator::GetDelayLeft (m_beaconWatchdog) < delay &&
-      m_beaconWatchdog.IsExpired ())
+  if (Simulator::GetDelayLeft (m_beaconWatchdog) < delay
+      && m_beaconWatchdog.IsExpired ())
     {
       NS_LOG_DEBUG ("really restart watchdog.");
       m_beaconWatchdog = Simulator::Schedule (delay, &StaWifiMac::MissedBeacons, this);
@@ -379,8 +380,8 @@
       NS_LOG_LOGIC ("packet sent by us.");
       return;
     }
-  else if (hdr->GetAddr1 () != GetAddress () &&
-           !hdr->GetAddr1 ().IsGroup ())
+  else if (hdr->GetAddr1 () != GetAddress ()
+           && !hdr->GetAddr1 ().IsGroup ())
     {
       NS_LOG_LOGIC ("packet is not for us");
       NotifyRxDrop (packet);
@@ -426,8 +427,8 @@
         }
       return;
     }
-  else if (hdr->IsProbeReq () ||
-           hdr->IsAssocReq ())
+  else if (hdr->IsProbeReq ()
+           || hdr->IsAssocReq ())
     {
       // This is a frame aimed at an AP, so we can safely ignore it.
       NotifyRxDrop (packet);
@@ -438,8 +439,8 @@
       MgtBeaconHeader beacon;
       packet->RemoveHeader (beacon);
       bool goodBeacon = false;
-      if (GetSsid ().IsBroadcast () ||
-          beacon.GetSsid ().IsEqual (GetSsid ()))
+      if (GetSsid ().IsBroadcast ()
+          || beacon.GetSsid ().IsEqual (GetSsid ()))
         {
           goodBeacon = true;
         }
@@ -545,13 +546,13 @@
 void
 StaWifiMac::SetState (MacState value)
 {
-  if (value == ASSOCIATED &&
-      m_state != ASSOCIATED)
+  if (value == ASSOCIATED
+      && m_state != ASSOCIATED)
     {
       m_assocLogger (GetBssid ());
     }
-  else if (value != ASSOCIATED &&
-           m_state == ASSOCIATED)
+  else if (value != ASSOCIATED
+           && m_state == ASSOCIATED)
     {
       m_deAssocLogger (GetBssid ());
     }