View | Details | Raw Unified | Return to bug 700
Collapse All | Expand All

(-)a/src/devices/wifi/wifi-mac.cc (-4 / +4 lines)
 Lines 231-237    Link Here 
231
WifiMac::Configure80211a (void)
231
WifiMac::Configure80211a (void)
232
{
232
{
233
  SetSifs(MicroSeconds(16));
233
  SetSifs(MicroSeconds(16));
234
  SetSlot(MicroSeconds(9)); 
234
  SetSlot(MicroSeconds(9 + 2*GetDefaultMaxPropagationDelay().GetMicroSeconds ())); 
235
  SetEifsNoDifs(MicroSeconds(16+44));
235
  SetEifsNoDifs(MicroSeconds(16+44));
236
  SetPifs(MicroSeconds(16+9));
236
  SetPifs(MicroSeconds(16+9));
237
  SetCtsTimeout(MicroSeconds(16+44+9+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
237
  SetCtsTimeout(MicroSeconds(16+44+9+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
 Lines 242-248    Link Here 
242
WifiMac::Configure80211b (void)
242
WifiMac::Configure80211b (void)
243
{
243
{
244
  SetSifs(MicroSeconds(10));
244
  SetSifs(MicroSeconds(10));
245
  SetSlot(MicroSeconds(20));
245
  SetSlot(MicroSeconds(20 + 2*GetDefaultMaxPropagationDelay().GetMicroSeconds ()));
246
  SetEifsNoDifs(MicroSeconds(10+304));
246
  SetEifsNoDifs(MicroSeconds(10+304));
247
  SetPifs(MicroSeconds(10+20));
247
  SetPifs(MicroSeconds(10+20));
248
  SetCtsTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
248
  SetCtsTimeout(MicroSeconds(10+304+20+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
 Lines 253-259    Link Here 
253
WifiMac::Configure80211_10Mhz (void)
253
WifiMac::Configure80211_10Mhz (void)
254
{
254
{
255
  SetSifs(MicroSeconds(32));
255
  SetSifs(MicroSeconds(32));
256
  SetSlot(MicroSeconds(13)); 
256
  SetSlot(MicroSeconds(13 + 2*GetDefaultMaxPropagationDelay().GetMicroSeconds ())); 
257
  SetEifsNoDifs(MicroSeconds(32+88));
257
  SetEifsNoDifs(MicroSeconds(32+88));
258
  SetPifs(MicroSeconds(32+13));
258
  SetPifs(MicroSeconds(32+13));
259
  SetCtsTimeout(MicroSeconds(32+88+13+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
259
  SetCtsTimeout(MicroSeconds(32+88+13+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
 Lines 264-270    Link Here 
264
WifiMac::Configure80211_5Mhz (void)
264
WifiMac::Configure80211_5Mhz (void)
265
{
265
{
266
  SetSifs(MicroSeconds(64));
266
  SetSifs(MicroSeconds(64));
267
  SetSlot(MicroSeconds(21));
267
  SetSlot(MicroSeconds(21 + 2*GetDefaultMaxPropagationDelay().GetMicroSeconds ()));
268
  SetEifsNoDifs(MicroSeconds(64+176));
268
  SetEifsNoDifs(MicroSeconds(64+176));
269
  SetPifs(MicroSeconds(64+21));
269
  SetPifs(MicroSeconds(64+21));
270
  SetCtsTimeout(MicroSeconds(64+176+21+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));
270
  SetCtsTimeout(MicroSeconds(64+176+21+GetDefaultMaxPropagationDelay().GetMicroSeconds ()*2));

Return to bug 700