# HG changeset patch
# User Hendrik vom Lehn <vomlehn@cs.rwth-aachen.de>
# Date 1279632770 -7200
# Node ID c67c27751d94d491e21d9403856e2d294d477016
# Parent  8ca3abfb3590bcc0af6aa0786ca8f88f966b8221
Fixed maximum packet sizes for WiFi

diff -r 8ca3abfb3590 -r c67c27751d94 src/devices/wifi/wifi-net-device.h
--- a/src/devices/wifi/wifi-net-device.h	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/wifi/wifi-net-device.h	Tue Jul 20 15:32:50 2010 +0200
@@ -104,8 +104,11 @@
 
 private:
 
-  // This value conforms to the 802.11 specification
-  static const uint16_t MAX_MSDU_SIZE = 2304;
+  /*
+   * 802.11 specifies 2304 as maximum MSDU size, but in this context 
+   * it is used without the 8-byte LLC header which is added later-on
+   */
+  static const uint16_t MAX_MSDU_SIZE = 2296;
 
   virtual void DoDispose (void);
   virtual void DoStart (void);
diff -r 8ca3abfb3590 -r c67c27751d94 src/devices/wifi/wifi-remote-station-manager.cc
--- a/src/devices/wifi/wifi-remote-station-manager.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/wifi/wifi-remote-station-manager.cc	Tue Jul 20 15:32:50 2010 +0200
@@ -152,14 +152,15 @@
                    MakeUintegerAccessor (&WifiRemoteStationManager::m_maxSlrc),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("RtsCtsThreshold", "If a data packet is bigger than this value, we use an RTS/CTS handshake"
-                   " before sending the data. This value will not have any effect on some rate control algorithms.",
-                   UintegerValue (1500),
+                   " before sending the data. This value will not have any effect on some rate control algorithms."
+                   " It is used after WifiNetDevice adds an 8-byte LLC header.",
+                   UintegerValue (1508),
                    MakeUintegerAccessor (&WifiRemoteStationManager::m_rtsCtsThreshold),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("FragmentationThreshold", "If a data packet is bigger than this value, we fragment it such that"
                    " the size of the fragments are equal or smaller than this value. This value will not have any effect"
-                   " on some rate control algorithms.",
-                   UintegerValue (1500),
+                   " on some rate control algorithms. It is used after WifiNetDevice adds an 8-byte LLC header.",
+                   UintegerValue (1508),
                    MakeUintegerAccessor (&WifiRemoteStationManager::m_fragmentationThreshold),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("NonUnicastMode", "Wifi mode used for non-unicast transmissions.",