View | Details | Raw Unified | Return to bug 292
Collapse All | Expand All

(-)a/src/devices/wifi/adhoc-wifi-mac.h (+1 lines)
 Lines 77-82    Link Here 
77 
  virtual void DoDispose (void);
 77 
  virtual void DoDispose (void);
78 
  /* invoked by the MacLows. */
 78 
  /* invoked by the MacLows. */
79 
  void ForwardUp (Ptr<Packet> packet, WifiMacHeader const*hdr);
 79 
  void ForwardUp (Ptr<Packet> packet, WifiMacHeader const*hdr);
80 
  AdhocWifiMac (const AdhocWifiMac & ctor_arg);
80 

          81
          

        

        

          81
          
  Ptr<DcaTxop> m_dca;

          82
          
  Ptr<DcaTxop> m_dca;

        

        

          82
          
  Callback<void,Ptr<Packet>,const Mac48Address &> m_upCallback;

          83
          
  Callback<void,Ptr<Packet>,const Mac48Address &> m_upCallback;

        



(-)a/src/devices/wifi/nqap-wifi-mac.h
      (+1 lines)




  

    

    

       Lines 104-109
       
    
  Link Here 
    

  

        

          104
          
  void SetBeaconGeneration (bool enable);

          104
          
  void SetBeaconGeneration (bool enable);

        

        

          105
          
  bool GetBeaconGeneration (void) const;

          105
          
  bool GetBeaconGeneration (void) const;

        

        

          106
          
  virtual void DoDispose (void);

          106
          
  virtual void DoDispose (void);

        

            

              
              
              107
              
  NqapWifiMac (const NqapWifiMac & ctor_arg);

            

        

          107
          

          108
          

        

        

          108
          
  Ptr<DcaTxop> m_dca;

          109
          
  Ptr<DcaTxop> m_dca;

        

        

          109
          
  Ptr<DcaTxop> m_beaconDca;

          110
          
  Ptr<DcaTxop> m_beaconDca;

        



(-)a/src/devices/wifi/nqsta-wifi-mac.h
      (+1 lines)




  

    

    

       Lines 120-125
       
    
  Link Here 
    

  

        

          120
          
  void RestartBeaconWatchdog (Time delay);

          120
          
  void RestartBeaconWatchdog (Time delay);

        

        

          121
          
  SupportedRates GetSupportedRates (void) const;

          121
          
  SupportedRates GetSupportedRates (void) const;

        

        

          122
          
  virtual void DoDispose (void);

          122
          
  virtual void DoDispose (void);

        

            

              
              
              123
              
  NqstaWifiMac (const NqstaWifiMac & ctor_arg);

            

        

          123
          

          124
          

        

        

          124
          
  enum {

          125
          
  enum {

        

        

          125
          
    ASSOCIATED,

          126
          
    ASSOCIATED,

        



(-)a/src/devices/wifi/wifi-phy.h
      (+2 lines)




  

    

    

       Lines 335-340
       
    
  Link Here 
    

  

        

          335
          
                       uint32_t m, uint32_t dfree,

          335
          
                       uint32_t m, uint32_t dfree,

        

        

          336
          
                       uint32_t adFree, uint32_t adFreePlusOne) const;

          336
          
                       uint32_t adFree, uint32_t adFreePlusOne) const;

        

        

          337
          
  double GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const;

          337
          
  double GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const;

        

            

              
              
              338
              
  WifiPhy (const WifiPhy & ctor_arg);

            

            

              339
              

            

        

          338
          
private:

          340
          
private:

        

        

          339
          
  uint64_t m_txPrepareDelayUs;

          341
          
  uint64_t m_txPrepareDelayUs;

        

        

          340
          
  uint64_t m_plcpLongPreambleDelayUs;

          342
          
  uint64_t m_plcpLongPreambleDelayUs;

        






  

  Return to bug 292