wifi: Populate radiotap header in order fields are serialized

Author: sderonne

RELEASE_NOTES.md

@@ -61,6 +61,7 @@ been tested on Linux. As of this release, the latest known version to work with
 - (wifi) Fix hardcoded threshold value in EHT PHY to determine per-20MHz CCA indication.
 - (wifi) #1295 - Avoid floating point precision issues in wifi-error-rate-models-test.cc
 - (internet) !2624 - Fix TCP LEDBAT congestion window growth calculation
+- (wifi) #1284 - Fix radiotap for received packets
 
 ## Release 3.46.1
 

src/wifi/helper/wifi-helper.cc

@@ -354,12 +354,6 @@ WifiPhyHelper::GetRadiotapHeader(Ptr<Packet> packet,
 
     header.SetWifiHeader(IsEht(preamble) ? 2 : 1);
 
-    if (signalNoise)
-    {
-        header.SetAntennaSignalPower(signalNoise->signal);
-        header.SetAntennaNoisePower(signalNoise->noise);
-    }
-
     header.SetTsft(Simulator::Now().GetMicroSeconds());
 
     uint8_t frameFlags = RadiotapHeader::FRAME_FLAG_NONE;
@@ -412,6 +406,12 @@ WifiPhyHelper::GetRadiotapHeader(Ptr<Packet> packet,
     }
     header.SetChannelFields(channelFields);
 
+    if (signalNoise)
+    {
+        header.SetAntennaSignalPower(signalNoise->signal);
+        header.SetAntennaNoisePower(signalNoise->noise);
+    }
+
     if (modClass == WIFI_MOD_CLASS_HT)
     {
         RadiotapHeader::McsFields mcsFields{.mcs = mcs};