--- a/src/wifi/model/regular-wifi-mac.cc	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/regular-wifi-mac.cc	Sun Sep 22 20:59:18 2013 -0700
@@ -701,12 +701,6 @@
 
   switch (standard)
     {
-    case WIFI_PHY_STANDARD_80211p_CCH:
-    case WIFI_PHY_STANDARD_80211p_SCH:
-      cwmin = 15;
-      cwmax = 511;
-      break;
-
     case WIFI_PHY_STANDARD_holland:
     case WIFI_PHY_STANDARD_80211a:
     case WIFI_PHY_STANDARD_80211g:
@@ -734,15 +728,7 @@
   // Now we configure the EDCA functions
   for (EdcaQueues::iterator i = m_edca.begin (); i != m_edca.end (); ++i)
     {
-      // Special configuration for 802.11p CCH
-      if (standard == WIFI_PHY_STANDARD_80211p_CCH)
-        {
-          ConfigureCCHDcf (i->second, cwmin, cwmax, i->first);
-        }
-      else
-        {
-          ConfigureDcf (i->second, cwmin, cwmax, i->first);
-        }
+      ConfigureDcf (i->second, cwmin, cwmax, i->first);
     }
 }
 

--- a/src/wifi/model/wifi-mac.cc	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/wifi-mac.cc	Sun Sep 22 20:59:18 2013 -0700
@@ -293,12 +293,6 @@
     case WIFI_PHY_STANDARD_holland:
       Configure80211a ();
       break;
-    case WIFI_PHY_STANDARD_80211p_CCH:
-      Configure80211p_CCH ();
-      break;
-    case WIFI_PHY_STANDARD_80211p_SCH:
-      Configure80211p_SCH ();
-      break;
     case WIFI_PHY_STANDARD_80211n_2_4GHZ:
       Configure80211n_2_4Ghz ();
       break;
@@ -369,17 +363,6 @@
 }
 
 void
-WifiMac::Configure80211p_CCH (void)
-{
-  Configure80211_10Mhz ();
-}
-
-void
-WifiMac::Configure80211p_SCH (void)
-{
-  Configure80211_10Mhz ();
-}
-void
 WifiMac::Configure80211n_2_4Ghz (void)
 {
   Configure80211g ();
@@ -432,41 +415,4 @@
       break;
     }
 }
-
-void
-WifiMac::ConfigureCCHDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac)
-{
-  /* see IEEE 1609.4-2006 section 6.3.1, Table 1 */
-  switch (ac)
-    {
-    case AC_VO:
-      dcf->SetMinCw ((cwmin + 1) / 4 - 1);
-      dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
-      dcf->SetAifsn (2);
-      break;
-    case AC_VI:
-      dcf->SetMinCw ((cwmin + 1) / 4 - 1);
-      dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
-      dcf->SetAifsn (3);
-      break;
-    case AC_BE:
-      dcf->SetMinCw ((cwmin + 1) / 2 - 1);
-      dcf->SetMaxCw (cwmin);
-      dcf->SetAifsn (6);
-      break;
-    case AC_BK:
-      dcf->SetMinCw (cwmin);
-      dcf->SetMaxCw (cwmax);
-      dcf->SetAifsn (9);
-      break;
-    case AC_BE_NQOS:
-      dcf->SetMinCw (cwmin);
-      dcf->SetMaxCw (cwmax);
-      dcf->SetAifsn (2);
-      break;
-    case AC_UNDEF:
-      NS_FATAL_ERROR ("I don't know what to do with this");
-      break;
-    }
-}
 } // namespace ns3

--- a/src/wifi/model/wifi-mac.h	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/wifi-mac.h	Sun Sep 22 20:59:18 2013 -0700
@@ -238,7 +238,6 @@
 
 protected:
   void ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);
-  void ConfigureCCHDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);
 private:
   static Time GetDefaultMaxPropagationDelay (void);
   static Time GetDefaultSlot (void);
@@ -268,8 +267,6 @@
   void Configure80211g (void);
   void Configure80211_10Mhz (void);
   void Configure80211_5Mhz ();
-  void Configure80211p_CCH (void);
-  void Configure80211p_SCH (void);
   void Configure80211n_2_4Ghz (void);
   void Configure80211n_5Ghz (void);
 

--- a/src/wifi/model/wifi-phy-standard.h	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/wifi-phy-standard.h	Sun Sep 22 20:59:18 2013 -0700
@@ -45,10 +45,6 @@
    *  ACM MOBICOM, 2001.
    */
   WIFI_PHY_STANDARD_holland,
-  /** \deprecated see <A HREF="http://www.nsnam.org/bugzilla/show_bug.cgi?id=945">bug 945</A> */
-  WIFI_PHY_STANDARD_80211p_CCH,
-  /** \deprecated see <A HREF="http://www.nsnam.org/bugzilla/show_bug.cgi?id=945">bug 945</A> */
-  WIFI_PHY_STANDARD_80211p_SCH,
   // 11n support
   WIFI_PHY_STANDARD_80211n_2_4GHZ,
   // needed for different mac parameters

--- a/src/wifi/model/yans-wifi-phy.cc	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/yans-wifi-phy.cc	Sun Sep 22 20:59:18 2013 -0700
@@ -218,12 +218,6 @@
     case WIFI_PHY_STANDARD_holland:
       ConfigureHolland ();
       break;
-    case WIFI_PHY_STANDARD_80211p_CCH:
-      Configure80211p_CCH ();
-      break;
-    case WIFI_PHY_STANDARD_80211p_SCH:
-      Configure80211p_SCH ();
-      break;
     case WIFI_PHY_STANDARD_80211n_2_4GHZ:
       m_channelStartingFrequency=2407;
       Configure80211n ();
@@ -685,38 +679,6 @@
 }
 
 void
-YansWifiPhy::Configure80211p_CCH (void)
-{
-  NS_LOG_FUNCTION (this);
-  m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
-
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
-}
-
-void
-YansWifiPhy::Configure80211p_SCH (void)
-{
-  NS_LOG_FUNCTION (this);
-  m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
-
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
-  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
-}
-
-void
 YansWifiPhy::RegisterListener (WifiPhyListener *listener)
 {
   m_state->RegisterListener (listener);

--- a/src/wifi/model/yans-wifi-phy.h	Sun Sep 22 20:00:33 2013 -0700
+++ b/src/wifi/model/yans-wifi-phy.h	Sun Sep 22 20:59:18 2013 -0700
@@ -166,11 +166,11 @@
   virtual void SetNumberOfTransmitAntennas (uint32_t tx);
   virtual uint32_t GetNumberOfTransmitAntennas (void) const;
   /**
-   * \param the number of recievers on this node.
+   * \param the number of receivers on this node.
    */
   virtual void SetNumberOfReceiveAntennas (uint32_t rx) ;
   /**
-   * \returns the number of recievers on this node.
+   * \returns the number of receivers on this node.
    */
   virtual uint32_t GetNumberOfReceiveAntennas (void) const;
   /**
@@ -245,8 +245,6 @@
   void Configure80211_10Mhz (void);
   void Configure80211_5Mhz ();
   void ConfigureHolland (void);
-  void Configure80211p_CCH (void);
-  void Configure80211p_SCH (void);
   void Configure80211n (void);
   double GetEdThresholdW (void) const;
   double DbmToW (double dbm) const;
@@ -272,7 +270,7 @@
 
   // number of transmitters
   uint32_t m_numberOfTransmitters;
-  // number of recievers
+  // number of receivers
   uint32_t m_numberOfReceivers;
   //if true use LDPC
   bool     m_ldpc;