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

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

Return to bug 700