Cleaning up comments
authorAshwin Narayan
Sat, 16 Jul 2011 13:48:11 -0400
changeset 7333f5584b38c721
parent 7332 07a8e2881ec2
child 7334 73cd7c02d5d3
Cleaning up comments
src/wifi/model/monitor-wifi-mac.h
     1.1 --- a/src/wifi/model/monitor-wifi-mac.h	Sat Jul 16 13:18:48 2011 -0400
     1.2 +++ b/src/wifi/model/monitor-wifi-mac.h	Sat Jul 16 13:48:11 2011 -0400
     1.3 @@ -141,18 +141,6 @@
     1.4     */
     1.5    virtual void SetAddress (Mac48Address address);
     1.6    /**
     1.7 -   * Not applicable in Monitor Mode
     1.8 -   */
     1.9 -  virtual void SetSsid (Ssid ssid);
    1.10 -  /**
    1.11 -   * Not applicable in Monitor Mode
    1.12 -   */
    1.13 -  virtual void SetBssid (Mac48Address bssid);
    1.14 -  /**
    1.15 -   * Not applicable in Monitor Mode
    1.16 -   */
    1.17 -  virtual Mac48Address GetBssid (void) const;
    1.18 -  /**
    1.19     * \brief Sets the interface in promiscuous mode.
    1.20     *
    1.21     * Enables promiscuous mode on the interface. Note that any further
    1.22 @@ -162,17 +150,23 @@
    1.23    virtual void SetPromisc (void);
    1.24    
    1.25    /**
    1.26 -   * Not applicable in Monitor Mode
    1.27 +   * The following functions have been inherited from RegularMacWifi
    1.28 +   * but are not applicable in Monitor Mode
    1.29     */
    1.30 +  virtual void SetSsid (Ssid ssid);
    1.31 +  virtual void SetBssid (Mac48Address bssid);
    1.32 +  virtual Mac48Address GetBssid (void) const;
    1.33    virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
    1.34 -  /**
    1.35 -   * Not applicable in Monitor Mode
    1.36 -   */
    1.37    virtual bool SupportsSendFrom (void) const;
    1.38 -  /**
    1.39 -   * Not applicable in Monitor Mode
    1.40 -   */
    1.41    virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
    1.42 +  virtual void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
    1.43 +                                           const WifiMacHeader *hdr);
    1.44 +  virtual void SendAddBaResponse (const MgtAddBaRequestHeader *reqHdr,
    1.45 +                                  Mac48Address originator);
    1.46 +  bool m_qosSupported;
    1.47 +  void SetQosSupported (bool enable);
    1.48 +  bool GetQosSupported () const;
    1.49 +
    1.50    /**
    1.51     * \param phy the physical layer attached to this MAC.
    1.52     */
    1.53 @@ -264,35 +258,6 @@
    1.54    virtual void TxFailed (const WifiMacHeader &hdr);
    1.55  
    1.56    void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
    1.57 -
    1.58 -  /**
    1.59 -   * Not applicable to Monitor Mode 
    1.60 -   *
    1.61 -   */
    1.62 -  virtual void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
    1.63 -                                           const WifiMacHeader *hdr);
    1.64 -  /**
    1.65 -   * Not applicable to Monitor Mode 
    1.66 -   *
    1.67 -   */
    1.68 -  virtual void SendAddBaResponse (const MgtAddBaRequestHeader *reqHdr,
    1.69 -                                  Mac48Address originator);
    1.70 -
    1.71 -  /**
    1.72 -   * Not applicable to Monitor Mode 
    1.73 -   *
    1.74 -   */
    1.75 -  bool m_qosSupported;
    1.76 -  /**
    1.77 -   * Not applicable to Monitor Mode 
    1.78 -   *
    1.79 -   */
    1.80 -  void SetQosSupported (bool enable);
    1.81 -  /**
    1.82 -   * Not applicable to Monitor Mode 
    1.83 -   *
    1.84 -   */
    1.85 -  bool GetQosSupported () const;
    1.86  private:
    1.87    /** Accessor for the DCF object */
    1.88    Ptr<DcaTxop> GetDcaTxop (void) const;