wifi: Fix OR operation with m_incrRetryCountUnderBa

It should be outside of the second argument passed to
GetBaAgreementEstablishedAsOriginator(). Otherwise will likely return BA agreement
(or lack thereof) for the wrong tid and RSM attribute IncrementRetryCountUnderBa
 will not work properly.

src/wifi/model/wifi-remote-station-manager.cc

@@ -1168,9 +1168,9 @@ WifiRemoteStationManager::DoIncrementRetryCountOnTxFailure(WifiRemoteStation* st
     const auto& hdr = psdu->GetHeader(0);
 
     if (hdr.IsMgt() || (hdr.IsData() && !hdr.IsQosData()) ||
-        (hdr.IsQosData() && (!m_wifiMac->GetBaAgreementEstablishedAsOriginator(
-                                hdr.GetAddr1(),
-                                hdr.GetQosTid() || m_incrRetryCountUnderBa))))
+        (hdr.IsQosData() &&
+         (!m_wifiMac->GetBaAgreementEstablishedAsOriginator(hdr.GetAddr1(), hdr.GetQosTid()) ||
+          m_incrRetryCountUnderBa)))
     {
         psdu->IncrementRetryCount();
     }

src/wifi/test/wifi-tx-stats-helper-test.cc

@@ -168,6 +168,8 @@ WifiTxStatsHelperTest::DoSetup()
 void
 WifiTxStatsHelperTest::DoRun()
 {
+    Config::SetDefault("ns3::WifiRemoteStationManager::IncrementRetryCountUnderBa",
+                       BooleanValue(true));
     std::string dataMode;
     std::string ackMode;
     if (m_option == SINGLE_LINK_NON_QOS)