--- a/examples/mixed-wireless.cc	Sat Jun 14 10:52:10 2008 -0700
+++ b/examples/mixed-wireless.cc	Tue Oct 28 11:26:58 2008 +0100
@@ -116,9 +116,6 @@
   //
   cmd.Parse (argc, argv);
 
-  // The metadata system (off by default) is used by ascii tracing below
-  Packet::EnableMetadata ();
-
   /////////////////////////////////////////////////////////////////////////// 
   //                                                                       //
   // Construct the backbone                                                //
@@ -199,9 +196,9 @@
       // collection.
       //
       CsmaHelper csma;
-      csma.SetChannelParameter ("DataRate", 
+      csma.SetChannelAttribute ("DataRate", 
         DataRateValue (DataRate (5000000)));
-      csma.SetChannelParameter ("Delay", TimeValue (MilliSeconds (2)));
+      csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));
       NetDeviceContainer lanDevices = csma.Install (lan);
       //
       // Add the IPv4 protocol stack to the new LAN nodes