--- a/src/devices/wifi/wifi-mac.cc	Wed Aug 25 09:10:32 2010 +0100
+++ b/src/devices/wifi/wifi-mac.cc	Mon Jul 05 10:15:37 2010 +0100
@@ -267,6 +267,9 @@
   case WIFI_PHY_STANDARD_80211b:
     Configure80211b ();
     break;
+  case WIFI_PHY_STANDARD_80211g:
+    Configure80211g ();
+    break;
   case WIFI_PHY_STANDARD_80211_10Mhz: 
     Configure80211_10Mhz ();
     break;
@@ -312,6 +315,18 @@
 }
 
 void
+WifiMac::Configure80211g (void)
+{
+  SetSifs(MicroSeconds(10));
+  // Note no support for Short Slot Time as yet
+  SetSlot(MicroSeconds(20));
+  SetEifsNoDifs(MicroSeconds(10+304));
+  SetPifs(MicroSeconds(10+20));
+  SetCtsTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
+  SetAckTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
+}
+
+void
 WifiMac::Configure80211_10Mhz (void)
 {
   SetSifs(MicroSeconds(32));