1.1 --- a/src/devices/wifi/mesh-wifi-preq-information-element.cc	Sat Feb 28 14:21:05 2009 +0300
     1.2 +++ b/src/devices/wifi/mesh-wifi-preq-information-element.cc	Sun Mar 01 02:39:10 2009 +0300
     1.3 @@ -116,7 +116,7 @@
     1.4  	m_originatorSeqNumber = 0;
     1.5  	m_metric = 0;
     1.6  	m_destCount = 0;
     1.7 -	m_maxSize = DEF_MAX_SIZE;
     1.8 +	m_maxSize = 32;
     1.9  }
    1.10  void
    1.11  WifiPreqInformationElement::SetUnicastPreq()

     2.1 --- a/src/devices/wifi/mesh-wifi-preq-information-element.h	Sat Feb 28 14:21:05 2009 +0300
     2.2 +++ b/src/devices/wifi/mesh-wifi-preq-information-element.h	Sun Mar 01 02:39:10 2009 +0300
     2.3 @@ -115,8 +115,7 @@
     2.4  		uint32_t	m_originatorSeqNumber;
     2.5  		uint32_t	m_lifetime;
     2.6  		uint32_t	m_metric;
     2.7 -		uint8_t	m_destCount;
     2.8 -#define DEF_MAX_SIZE	32
     2.9 +		uint8_t		m_destCount;
    2.10  };
    2.11  
    2.12  } //namespace ns3

     3.1 --- a/src/devices/wifi/wifi-mac-header.cc	Sat Feb 28 14:21:05 2009 +0300
     3.2 +++ b/src/devices/wifi/wifi-mac-header.cc	Sun Mar 01 02:39:10 2009 +0300
     3.3 @@ -1073,20 +1073,20 @@
     3.4  {
     3.5  	if (num_of_addresses > 3)
     3.6  		return;
     3.7 -	m_meshFlags = MESH_AE_MASK| (num_of_addresses << MESH_AE_SHIFT);
     3.8 +	m_meshFlags = 0xc0 | (num_of_addresses << 6);
     3.9  }
    3.10  
    3.11  uint8_t
    3.12  WifiMeshHeader::GetAddressExt ()
    3.13  {
    3.14 -	return ((MESH_AE_MASK & m_meshFlags) >> MESH_AE_SHIFT);
    3.15 +	return ((0xc0 & m_meshFlags) >> 6);
    3.16  }
    3.17  
    3.18  
    3.19  uint32_t
    3.20  WifiMeshHeader::GetSerializedSize (void) const
    3.21  {
    3.22 -	return 6 + ((MESH_AE_MASK & m_meshFlags) >> MESH_AE_SHIFT)*6;
    3.23 +	return 6 + ((0xc0 & m_meshFlags) >> 6)*6;
    3.24  }
    3.25  
    3.26  void
    3.27 @@ -1096,7 +1096,7 @@
    3.28  	i.WriteU8(m_meshFlags);
    3.29  	i.WriteU8(m_meshTtl);
    3.30  	i.WriteU32(m_meshSeqno);
    3.31 -	uint8_t addresses_to_add = (m_meshFlags & MESH_AE_MASK) >> MESH_AE_SHIFT;
    3.32 +	uint8_t addresses_to_add = (m_meshFlags & 0xc0) >> 6;
    3.33  	//Writing Address extensions:
    3.34  	if(addresses_to_add > 0)
    3.35  		WriteTo (i, m_addr5);
    3.36 @@ -1114,7 +1114,7 @@
    3.37  	m_meshFlags = i.ReadU8();
    3.38  	m_meshTtl = i.ReadU8();
    3.39  	m_meshSeqno = i.ReadU32();
    3.40 -	addresses_to_read = (m_meshFlags & MESH_AE_MASK) >> MESH_AE_SHIFT;
    3.41 +	addresses_to_read = (m_meshFlags & 0xc0) >> 6;
    3.42  	if(addresses_to_read > 0)
    3.43  		ReadFrom (i, m_addr5);
    3.44  	if(addresses_to_read > 1)

     4.1 --- a/src/devices/wifi/wifi-mac-header.h	Sat Feb 28 14:21:05 2009 +0300
     4.2 +++ b/src/devices/wifi/wifi-mac-header.h	Sun Mar 01 02:39:10 2009 +0300
     4.3 @@ -202,8 +202,6 @@
     4.4  		void			SetMeshTtl (uint8_t TTL);
     4.5  		uint8_t		GetMeshTtl ();
     4.6  
     4.7 -#define MESH_AE_MASK	0xc0
     4.8 -#define MESH_AE_SHIFT	6
     4.9  		void			SetAddressExt (uint8_t num_of_addresses);
    4.10  		uint8_t		GetAddressExt ();
    4.11