This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/csma/model/csma-net-device.cc 2013-05-12 18:50:15.000000000 +0200 | |
+++ ./src/csma/model/csma-net-device.cc 2013-07-15 00:20:01.168749548 +0200 | |
@@ -699,7 +699,6 @@ CsmaNetDevice::Receive (Ptr<Packet> pack | |
trailer.EnableFcs (true); | |
} | |
- trailer.CheckFcs (packet); | |
bool crcGood = trailer.CheckFcs (packet); | |
if (!crcGood) | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/wifi/model/sta-wifi-mac.cc | |
+++ ./src/wifi/model/sta-wifi-mac.cc | |
@@ -109,6 +109,16 @@ | |
StaWifiMac::~StaWifiMac () | |
{ | |
NS_LOG_FUNCTION (this); | |
+} | |
+ | |
+void | |
+StaWifiMac::SetAddress (Mac48Address address) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/wifi/model/edca-txop-n.cc 2013-05-12 18:50:16.000000000 +0200 | |
+++ ./src/wifi/model/edca-txop-n.cc 2013-06-01 01:53:32.137853867 +0200 | |
@@ -835,10 +835,14 @@ EdcaTxopN::MapSrcAddressForAggregation ( | |
{ | |
retval = hdr.GetAddr2 (); | |
} | |
- else | |
+ else if (m_typeOfStation == AP) | |
{ | |
retval = hdr.GetAddr3 (); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/tap-bridge/model/tap-bridge.cc 2013-07-22 04:03:53.671898613 +0200 | |
+++ ./src/tap-bridge/model/tap-bridge.cc 2013-07-19 08:36:33.963029004 +0200 | |
@@ -674,6 +674,7 @@ TapBridge::CreateTap (void) | |
NS_LOG_INFO ("Underlying ns-3 device will continue to use default address, what can lead to connectivity errors"); | |
} | |
} | |
+ NotifyLinkUp (); | |
return; | |
} | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/tap-bridge/model/tap-bridge.cc 2013-05-12 18:50:16.000000000 +0200 | |
+++ ./src/tap-bridge/model/tap-bridge.cc 2013-07-17 05:44:32.363514463 +0200 | |
@@ -44,6 +44,13 @@ | |
#include <cstdlib> | |
#include <unistd.h> | |
+#include <stdio.h> | |
+#include <fcntl.h> | |
+#include <net/if.h> | |
+#include <linux/if_tun.h> |