Merge pull request #19 from hiok2000/patch-3

liyuliang001 · web-flow · commit 9f4be2a9ead8 · 2021-03-11T17:48:18.000-06:00
Update rdma-hw.cc
diff --git a/simulation/src/point-to-point/model/rdma-hw.cc b/simulation/src/point-to-point/model/rdma-hw.cc
@@ -786,7 +786,7 @@ void RdmaHw::UpdateRateHp(Ptr<RdmaQueuePair> qp, Ptr<Packet> p, CustomHeader &ch
 			NS_ASSERT(ih.nhop <= IntHeader::maxHop);
 			for (uint32_t i = 0; i < ih.nhop; i++){
 				if (m_sampleFeedback){
-					if (ih.hop[i].GetQlen() == 0 and fast_react)
+					if (ih.hop[i].GetQlen() == 0 && fast_react)
 						continue;
 				}
 				updated[i] = updated_any = true;

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,7 @@ void RdmaHw::UpdateRateHp(Ptr<RdmaQueuePair> qp, Ptr<Packet> p, CustomHeader &ch`
`786`	`786`	`NS_ASSERT(ih.nhop <= IntHeader::maxHop);`
`787`	`787`	`for (uint32_t i = 0; i < ih.nhop; i++){`
`788`	`788`	`if (m_sampleFeedback){`
`789`		`- if (ih.hop[i].GetQlen() == 0 and fast_react)`
	`789`	`+ if (ih.hop[i].GetQlen() == 0 && fast_react)`
`790`	`790`	`continue;`
`791`	`791`	`}`
`792`	`792`	`updated[i] = updated_any = true;`