From b5685eb9ee67cd4313553f0c8a975871264dec5f Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 4 May 2009 11:24:17 +0200
Subject: [PATCH] Fix build on osx-ppc optimized gcc 4.0.1

---
 src/devices/wifi/edca-txop-n.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/devices/wifi/edca-txop-n.cc b/src/devices/wifi/edca-txop-n.cc
index dc5052c7a..5c751ecef 100644
--- a/src/devices/wifi/edca-txop-n.cc
+++ b/src/devices/wifi/edca-txop-n.cc
@@ -659,27 +659,31 @@ EdcaTxopN::GetFragmentPacket (WifiMacHeader *hdr)
 Mac48Address
 EdcaTxopN::MapSrcAddressForAggregation (WifiMacHeader const &hdr)
 {
+  Mac48Address retval;
   if (m_typeOfStation == STA || m_typeOfStation == ADHOC_STA)
     {
-      return hdr.GetAddr2 ();
+      retval = hdr.GetAddr2 ();
     }
   else
     {
-      return hdr.GetAddr3 ();
+      retval = hdr.GetAddr3 ();
     }
+  return retval;
 }
 
 Mac48Address
 EdcaTxopN::MapDestAddressForAggregation (WifiMacHeader const &hdr)
 {
+  Mac48Address retval;
   if (m_typeOfStation == AP || m_typeOfStation == ADHOC_STA)
     {
-      return hdr.GetAddr1 ();
+      retval = hdr.GetAddr1 ();
     }
   else
     {
-      return hdr.GetAddr3 ();
+      retval = hdr.GetAddr3 ();
     }
+  return retval;
 }
 
 void