1.1 --- a/src/common/pcap-writer.h	Wed Jun 03 17:40:03 2009 +0200
     1.2 +++ b/src/common/pcap-writer.h	Wed Jun 03 17:42:13 2009 +0200
     1.3 @@ -124,7 +124,9 @@
     1.4     * @param signalDbm signal power in dBm
     1.5     * @param noiseDbm  noise power in dBm
     1.6     */
     1.7 -  void WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, bool isTx, double signalDbm, double noiseDbm);
     1.8 +  void WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz, 
     1.9 +                              uint32_t rate, bool isShortPreamble, bool isTx, 
    1.10 +                              double signalDbm, double noiseDbm);
    1.11  
    1.12  
    1.13  

     2.1 --- a/src/devices/wifi/wifi-phy.h	Wed Jun 03 17:40:03 2009 +0200
     2.2 +++ b/src/devices/wifi/wifi-phy.h	Wed Jun 03 17:42:13 2009 +0200
     2.3 @@ -313,7 +313,8 @@
     2.4     * @param signalDbm signal power in dBm
     2.5     * @param noiseDbm  noise power in dBm
     2.6     */
     2.7 -  void NotifyPromiscSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm);
     2.8 +  void NotifyPromiscSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint32_t rate, bool isShortPreamble, 
     2.9 +                             double signalDbm, double noiseDbm);
    2.10  
    2.11    /** 
    2.12     * 

     3.1 --- a/src/helper/yans-wifi-helper.cc	Wed Jun 03 17:40:03 2009 +0200
     3.2 +++ b/src/helper/yans-wifi-helper.cc	Wed Jun 03 17:42:13 2009 +0200
     3.3 @@ -31,14 +31,16 @@
     3.4  
     3.5  namespace ns3 {
     3.6  
     3.7 -static void PcapSniffTxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  uint32_t rate, bool isShortPreamble)
     3.8 +static void PcapSniffTxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  
     3.9 +                              uint32_t rate, bool isShortPreamble)
    3.10  {
    3.11    const double unusedValue = 0;
    3.12    writer->WriteWifiMonitorPacket(packet, channelFreqMhz, rate, isShortPreamble, true, unusedValue, unusedValue); 
    3.13  }
    3.14  
    3.15  
    3.16 -static void PcapSniffRxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm)
    3.17 +static void PcapSniffRxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  
    3.18 +                              uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm)
    3.19  {
    3.20    writer->WriteWifiMonitorPacket(packet, channelFreqMhz, rate, isShortPreamble, false, signalDbm, noiseDbm); 
    3.21  }