1.1 --- a/src/devices/wifi/edca-txop-n.cc	Fri May 01 09:07:04 2009 -0700
     1.2 +++ b/src/devices/wifi/edca-txop-n.cc	Mon May 04 11:24:17 2009 +0200
     1.3 @@ -659,27 +659,31 @@
     1.4  Mac48Address
     1.5  EdcaTxopN::MapSrcAddressForAggregation (WifiMacHeader const &hdr)
     1.6  {
     1.7 +  Mac48Address retval;
     1.8    if (m_typeOfStation == STA || m_typeOfStation == ADHOC_STA)
     1.9      {
    1.10 -      return hdr.GetAddr2 ();
    1.11 +      retval = hdr.GetAddr2 ();
    1.12      }
    1.13    else
    1.14      {
    1.15 -      return hdr.GetAddr3 ();
    1.16 +      retval = hdr.GetAddr3 ();
    1.17      }
    1.18 +  return retval;
    1.19  }
    1.20  
    1.21  Mac48Address
    1.22  EdcaTxopN::MapDestAddressForAggregation (WifiMacHeader const &hdr)
    1.23  {
    1.24 +  Mac48Address retval;
    1.25    if (m_typeOfStation == AP || m_typeOfStation == ADHOC_STA)
    1.26      {
    1.27 -      return hdr.GetAddr1 ();
    1.28 +      retval = hdr.GetAddr1 ();
    1.29      }
    1.30    else
    1.31      {
    1.32 -      return hdr.GetAddr3 ();
    1.33 +      retval = hdr.GetAddr3 ();
    1.34      }
    1.35 +  return retval;
    1.36  }
    1.37  
    1.38  void