--- a/src/wifi/doc/source/wifi-user.rst	Mon Sep 14 19:07:56 2015 +0200
+++ b/src/wifi/doc/source/wifi-user.rst	Mon Sep 14 13:34:07 2015 -0700
@@ -421,7 +421,7 @@
 Note on the current implementation
 **********************************
 
-* 802.11g does not support 9 microseconds slot
+* 802.11g supports a default of long slot time (20 microseconds)
 * PHY_RXSTART is not supported
 * 802.11e TXOP is not supported
 * 802.11n/ac MIMO is not supported

--- a/src/wifi/model/wifi-mac.cc	Mon Sep 14 19:07:56 2015 +0200
+++ b/src/wifi/model/wifi-mac.cc	Mon Sep 14 13:34:07 2015 -0700
@@ -350,7 +350,11 @@
 WifiMac::Configure80211g (void)
 {
   SetSifs (MicroSeconds (10));
-  //Note: no support for Short Slot Time yet
+  // Slot time defaults to the "long slot time" of 20 us in the standard
+  // according to mixed 802.11b/g deployments.  Short slot time is supported
+  // if the user sets the slot to 9 us *after* calling Configure80211g().
+  // The other parameters below should also be adjusted accordingly as they
+  // depend on slot time.
   SetSlot (MicroSeconds (20));
   SetEifsNoDifs (MicroSeconds (10 + 304));
   SetPifs (MicroSeconds (10 + 20));