Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed UanPhyGen::IsStateBusy method bug
authorAndrea Sacco
Tue, 25 Jan 2011 19:42:58 +0100
changeset 6781 cf2c1dd6db25
parent 6780 e1189bae98e5
child 6782 c7cbb4879839
Fixed UanPhyGen::IsStateBusy method bug
RELEASE_NOTES file | annotate | diff | comparison | revisions
src/devices/uan/model/uan-phy-gen.cc file | annotate | diff | comparison | revisions 
--- a/RELEASE_NOTES	Mon Jan 24 09:49:57 2011 -0800
+++ b/RELEASE_NOTES	Tue Jan 25 19:42:58 2011 +0100
@@ -164,6 +164,7 @@
    - bug 1030 - routing/aodv example fixed
    - bug 1031 - Wifi hidden terminal example does not work
    - bug 1032 - Unable to specify multiple Compiler/Linker flags
+   - Fixed the UanPhyGen::IsStateBusy method, error with logical OR
 
 Known issues
 ------------
--- a/src/devices/uan/model/uan-phy-gen.cc	Mon Jan 24 09:49:57 2011 -0800
+++ b/src/devices/uan/model/uan-phy-gen.cc	Tue Jan 25 19:42:58 2011 +0100
@@ -708,7 +708,7 @@
 bool
 UanPhyGen::IsStateBusy (void)
 {
-  return !IsStateIdle () || !IsStateSleep ();
+  return !IsStateIdle () && !IsStateSleep ();
 }
 bool
 UanPhyGen::IsStateRx (void)
ns-3.24