From 77efe54de3b30b0f4c1355b42be2af962fd09372 Mon Sep 17 00:00:00 2001
From: Pavel Boyko <boyko@iitp.ru>
Date: Mon, 8 Jun 2009 15:48:46 +0400
Subject: [PATCH] merge fix

---
 src/devices/wifi/yans-wifi-phy.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/devices/wifi/yans-wifi-phy.cc b/src/devices/wifi/yans-wifi-phy.cc
index 2bc8ecdf9..a1cda852b 100644
--- a/src/devices/wifi/yans-wifi-phy.cc
+++ b/src/devices/wifi/yans-wifi-phy.cc
@@ -116,6 +116,11 @@ YansWifiPhy::GetTypeId (void)
                    PointerValue (),
                    MakePointerAccessor (&YansWifiPhy::m_state),
                    MakePointerChecker<WifiPhyStateHelper> ())
+    .AddAttribute ("ChannelSwitchDelay",
+                   "Delay between two short frames transmitted on different frequencies",
+                   TimeValue (MicroSeconds (250)),
+                   MakeTimeAccessor (&YansWifiPhy::m_channelSwitchDelay), 
+                   MakeTimeChecker ())
     ;
   return tid;
 }