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

(-)a/src/devices/wifi/adhoc-wifi-mac.cc (+4 lines)
 Lines 41-46    Link Here 
41 
    .AddConstructor<AdhocWifiMac> ()
 41 
    .AddConstructor<AdhocWifiMac> ()
42 
    ;
 42 
    ;
43 
  return tid;
 43 
  return tid;
44 
}
45 

            

            

              46
              
AdhocWifiMac::AdhocWifiMac (const AdhocWifiMac & ctor_arg)

            

            

              47
              
{

            

        

          44
          
}

          48
          
}

        

        

          45
          

          49
          

        

        

          46
          
AdhocWifiMac::AdhocWifiMac ()

          50
          
AdhocWifiMac::AdhocWifiMac ()

        



(-)a/src/devices/wifi/adhoc-wifi-mac.h
      (+3 lines)




  

    

    

       Lines 44-49
       
    
  Link Here 
    

  

        

          44
          
 */

          44
          
 */

        

        

          45
          
class AdhocWifiMac : public WifiMac 

          45
          
class AdhocWifiMac : public WifiMac 

        

        

          46
          
{

          46
          
{

        

            

              
              
              47
              
private:

            

            

              48
              
  AdhocWifiMac (const AdhocWifiMac & ctor_arg);

            

            

              49
              

            

        

          47
          
public:

          50
          
public:

        

        

          48
          
  typedef Callback<void, Ptr<Packet>, const Mac48Address &> ForwardCallback;

          51
          
  typedef Callback<void, Ptr<Packet>, const Mac48Address &> ForwardCallback;

        

        

          49
          

          52
          

        



(-)a/src/devices/wifi/nqap-wifi-mac.cc
      (+3 lines)




  

    

    

       Lines 56-61
       
    
  Link Here 
    

  

        

          56
          
    ;

          56
          
    ;

        

        

          57
          
  return tid;

          57
          
  return tid;

        

        

          58
          
}

          58
          
}

        

            

              
              
              59
              

            

            

              60
              
NqapWifiMac::NqapWifiMac (const NqapWifiMac & ctor_arg)

            

            

              61
              
{}

            

        

          59
          

          62
          

        

        

          60
          
NqapWifiMac::NqapWifiMac ()

          63
          
NqapWifiMac::NqapWifiMac ()

        

        

          61
          
{

          64
          
{

        



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




  

    

    

       Lines 52-57
       
    
  Link Here 
    

  

        

          52
          
 */

          52
          
 */

        

        

          53
          
class NqapWifiMac : public WifiMac

          53
          
class NqapWifiMac : public WifiMac

        

        

          54
          
{

          54
          
{

        

            

              
              
              55
              
private:

            

            

              56
              
  NqapWifiMac (const NqapWifiMac & ctor_arg);

            

            

              57
              

            

        

          55
          
public:

          58
          
public:

        

        

          56
          
  static TypeId GetTypeId (void);

          59
          
  static TypeId GetTypeId (void);

        

        

          57
          

          60
          

        



(-)a/src/devices/wifi/nqsta-wifi-mac.cc
      (+3 lines)




  

    

    

       Lines 84-89
       
    
  Link Here 
    

  

        

          84
          
  return tid;

          84
          
  return tid;

        

        

          85
          
}

          85
          
}

        

        

          86
          

          86
          

        

            

              
              
              87
              
NqstaWifiMac::NqstaWifiMac (const NqstaWifiMac & ctor_arg)

            

            

              88
              
{

            

            

              89
              
}

            

        

          87
          

          90
          

        

        

          88
          
NqstaWifiMac::NqstaWifiMac ()

          91
          
NqstaWifiMac::NqstaWifiMac ()

        

        

          89
          
  : m_state (BEACON_MISSED),

          92
          
  : m_state (BEACON_MISSED),

        



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




  

    

    

       Lines 52-57
       
    
  Link Here 
    

  

        

          52
          
 */

          52
          
 */

        

        

          53
          
class NqstaWifiMac : public WifiMac

          53
          
class NqstaWifiMac : public WifiMac

        

        

          54
          
{

          54
          
{

        

            

              
              
              55
              
private:

            

            

              56
              
  NqstaWifiMac (const NqstaWifiMac & ctor_arg);

            

            

              57
              

            

        

          55
          
public:

          58
          
public:

        

        

          56
          
  static TypeId GetTypeId (void);

          59
          
  static TypeId GetTypeId (void);

        

        

          57
          

          60
          

        



(-)a/src/devices/wifi/wifi-phy.cc
      (+4 lines)




  

    

    

       Lines 246-251
       
    
  Link Here 
    

  

        

          246
          
                     MakeTraceSourceAccessor (&WifiPhy::m_txTrace))

          246
          
                     MakeTraceSourceAccessor (&WifiPhy::m_txTrace))

        

        

          247
          
    ;

          247
          
    ;

        

        

          248
          
  return tid;

          248
          
  return tid;

        

            

              
              
              249
              
}

            

            

              250
              

            

            

              251
              
WifiPhy::WifiPhy (const WifiPhy & ctor_arg)

            

            

              252
              
{

            

        

          249
          
}

          253
          
}

        

        

          250
          

          254
          

        

        

          251
          
WifiPhy::WifiPhy ()

          255
          
WifiPhy::WifiPhy ()

        



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




  

    

    

       Lines 106-111
       
    
  Link Here 
    

  

        

          106
          
 */

          106
          
 */

        

        

          107
          
class WifiPhy : public Object

          107
          
class WifiPhy : public Object

        

        

          108
          
{

          108
          
{

        

            

              
              
              109
              
private:

            

            

              110
              
  WifiPhy (const WifiPhy & ctor_arg);

            

            

              111
              

            

        

          109
          
public:

          112
          
public:

        

        

          110
          
  /**

          113
          
  /**

        

        

          111
          
   * The state of the PHY layer.

          114
          
   * The state of the PHY layer.

        






  

  Return to bug 292