From 7da27a7b09c5bfed4be891155fe762f06db30f36 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Tue, 3 Aug 2010 18:02:55 +0200
Subject: [PATCH] fixed  Bug 941 - Wifi Dcf attributes not reachable

---
 src/devices/wifi/dca-txop.cc    | 3 +--
 src/devices/wifi/dca-txop.h     | 8 ++++----
 src/devices/wifi/edca-txop-n.cc | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/devices/wifi/dca-txop.cc b/src/devices/wifi/dca-txop.cc
index 28ff33700..ffc78e9e0 100644
--- a/src/devices/wifi/dca-txop.cc
+++ b/src/devices/wifi/dca-txop.cc
@@ -60,7 +60,6 @@ private:
   virtual void DoNotifyChannelSwitching (void) { 
     m_txop->NotifyChannelSwitching ();
   }
-
   DcaTxop *m_txop;
 };
 
@@ -101,7 +100,7 @@ TypeId
 DcaTxop::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::DcaTxop")
-    .SetParent<Object> ()
+    .SetParent (ns3::Dcf::GetTypeId ())
     .AddConstructor<DcaTxop> ()
     ;
   return tid;
diff --git a/src/devices/wifi/dca-txop.h b/src/devices/wifi/dca-txop.h
index 6febeaf46..c4d8d5463 100644
--- a/src/devices/wifi/dca-txop.h
+++ b/src/devices/wifi/dca-txop.h
@@ -26,10 +26,10 @@
 #include "ns3/packet.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"
-#include "wifi-mac-header.h"
-#include "wifi-mode.h"
-#include "wifi-remote-station-manager.h"
-#include "dcf.h"
+#include "ns3/wifi-mac-header.h"
+#include "ns3/wifi-mode.h"
+#include "ns3/wifi-remote-station-manager.h"
+#include "ns3/dcf.h"
 
 namespace ns3 {
 
diff --git a/src/devices/wifi/edca-txop-n.cc b/src/devices/wifi/edca-txop-n.cc
index 2b7639dee..ebd4bdf92 100644
--- a/src/devices/wifi/edca-txop-n.cc
+++ b/src/devices/wifi/edca-txop-n.cc
@@ -124,7 +124,7 @@ TypeId
 EdcaTxopN::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EdcaTxopN")
-    .SetParent<Object> ()
+    .SetParent (ns3::Dcf::GetTypeId ())
     .AddConstructor<EdcaTxopN> ()
     .AddAttribute ("BlockAckThreshold", "If number of packets in this queue reaches this value,\
                                          block ack mechanism is used. If this value is 0, block ack is never used.",