merge with tip

2009-04-26 15:36:59 -07:00
parent cb77b59846 392183de10
commit aaab024589
1 changed files with 2 additions and 2 deletions
--- a/src/devices/wifi/wifi-mac-header.cc
+++ b/src/devices/wifi/wifi-mac-header.cc
@@ -317,10 +317,10 @@ void WifiMacHeader::SetQosAckPolicy (enum QosAckPolicy policy)
    m_qosAckPolicy = 0;
    break;
  case NO_ACK :
-    m_qosAckPolicy = 2;
+    m_qosAckPolicy = 1;
    break;
  case NO_EXPLICIT_ACK :
-    m_qosAckPolicy = 1;
+    m_qosAckPolicy = 2;
    break;
  case BLOCK_ACK :
    m_qosAckPolicy = 3;