merge

src/devices/point-to-point/ppp-header.cc

@@ -56,7 +56,20 @@ PppHeader::GetInstanceTypeId (void) const
 void 
 PppHeader::Print (std::ostream &os) const
 {
-  os << "Point-to-Point Protocol: " << m_protocol;
+  std::string proto;
+  
+  switch(m_protocol)
+  {
+    case 0x0021: /* IPv4 */
+      proto = "IP (0x0021)";
+      break;
+    case 0x0057: /* IPv6 */
+      proto = "IPv6 (0x0057)";
+      break;
+    default:
+      NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
+  }
+  os << "Point-to-Point Protocol: " << proto; 
 }
 
   uint32_t

src/devices/wifi/wifi-net-device.cc

@@ -91,6 +91,15 @@ WifiNetDevice::DoDispose (void)
   NetDevice::DoDispose ();
 }
 
+void
+WifiNetDevice::DoStart (void)
+{
+  m_phy->Start ();
+  m_mac->Start ();
+  m_stationManager->Start ();
+  NetDevice::DoStart ();
+}
+
 void
 WifiNetDevice::CompleteConfig (void)
 {

src/devices/wifi/wifi-net-device.h

@@ -104,6 +104,7 @@ public:
 
 private:
   virtual void DoDispose (void);
+  virtual void DoStart (void);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   void LinkUp (void);
   void LinkDown (void);