# HG changeset patch
# User Ashwin Narayan
# Date 1310838491 14400
# Node ID f5584b38c721dceb3e32ac287b79623c77021d80
# Parent  07a8e2881ec2bbfc119c7864e387d4e94f50748c
Cleaning up comments

diff -r 07a8e2881ec2 -r f5584b38c721 src/wifi/model/monitor-wifi-mac.h
--- a/src/wifi/model/monitor-wifi-mac.h	Sat Jul 16 13:18:48 2011 -0400
+++ b/src/wifi/model/monitor-wifi-mac.h	Sat Jul 16 13:48:11 2011 -0400
@@ -141,18 +141,6 @@
    */
   virtual void SetAddress (Mac48Address address);
   /**
-   * Not applicable in Monitor Mode
-   */
-  virtual void SetSsid (Ssid ssid);
-  /**
-   * Not applicable in Monitor Mode
-   */
-  virtual void SetBssid (Mac48Address bssid);
-  /**
-   * Not applicable in Monitor Mode
-   */
-  virtual Mac48Address GetBssid (void) const;
-  /**
    * \brief Sets the interface in promiscuous mode.
    *
    * Enables promiscuous mode on the interface. Note that any further
@@ -162,17 +150,23 @@
   virtual void SetPromisc (void);
   
   /**
-   * Not applicable in Monitor Mode
-   */
-  virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
-  /**
-   * Not applicable in Monitor Mode
+   * The following functions have been inherited from RegularMacWifi
+   * but are not applicable in Monitor Mode
    */
+  virtual void SetSsid (Ssid ssid);
+  virtual void SetBssid (Mac48Address bssid);
+  virtual Mac48Address GetBssid (void) const;
+  virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
   virtual bool SupportsSendFrom (void) const;
-  /**
-   * Not applicable in Monitor Mode
-   */
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
+  virtual void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
+                                           const WifiMacHeader *hdr);
+  virtual void SendAddBaResponse (const MgtAddBaRequestHeader *reqHdr,
+                                  Mac48Address originator);
+  bool m_qosSupported;
+  void SetQosSupported (bool enable);
+  bool GetQosSupported () const;
+
   /**
    * \param phy the physical layer attached to this MAC.
    */
@@ -264,35 +258,6 @@
   virtual void TxFailed (const WifiMacHeader &hdr);
 
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
-
-  /**
-   * Not applicable to Monitor Mode 
-   *
-   */
-  virtual void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
-                                           const WifiMacHeader *hdr);
-  /**
-   * Not applicable to Monitor Mode 
-   *
-   */
-  virtual void SendAddBaResponse (const MgtAddBaRequestHeader *reqHdr,
-                                  Mac48Address originator);
-
-  /**
-   * Not applicable to Monitor Mode 
-   *
-   */
-  bool m_qosSupported;
-  /**
-   * Not applicable to Monitor Mode 
-   *
-   */
-  void SetQosSupported (bool enable);
-  /**
-   * Not applicable to Monitor Mode 
-   *
-   */
-  bool GetQosSupported () const;
 private:
   /** Accessor for the DCF object */
   Ptr<DcaTxop> GetDcaTxop (void) const;