From c16fb420277ffdc4430a2818117df4cfe097eaa7 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 7 Jun 2015 16:42:28 +0200 Subject: [PATCH] Bug 2136 [wifi] - The usage of tid in wifi and wave module shall be if (tid > 7) rather than if (tid >= 7) --- src/wave/model/ocb-wifi-mac.cc | 2 +- src/wifi/model/adhoc-wifi-mac.cc | 2 +- src/wifi/model/ap-wifi-mac.cc | 2 +- src/wifi/model/sta-wifi-mac.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wave/model/ocb-wifi-mac.cc b/src/wave/model/ocb-wifi-mac.cc index 1a522ca0c..166e5276f 100644 --- a/src/wave/model/ocb-wifi-mac.cc +++ b/src/wave/model/ocb-wifi-mac.cc @@ -190,7 +190,7 @@ OcbWifiMac::Enqueue (Ptr packet, Mac48Address to) // Any value greater than 7 is invalid and likely indicates that // the packet had no QoS tag, so we revert to zero, which'll // mean that AC_BE is used. - if (tid >= 7) + if (tid > 7) { tid = 0; } diff --git a/src/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc index f1dcaf783..a8e671a64 100644 --- a/src/wifi/model/adhoc-wifi-mac.cc +++ b/src/wifi/model/adhoc-wifi-mac.cc @@ -119,7 +119,7 @@ AdhocWifiMac::Enqueue (Ptr packet, Mac48Address to) // Any value greater than 7 is invalid and likely indicates that // the packet had no QoS tag, so we revert to zero, which'll // mean that AC_BE is used. - if (tid >= 7) + if (tid > 7) { tid = 0; } diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 38a56e927..94c5143a1 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -207,7 +207,7 @@ ApWifiMac::ForwardDown (Ptr packet, Mac48Address from, // Any value greater than 7 is invalid and likely indicates that // the packet had no QoS tag, so we revert to zero, which'll // mean that AC_BE is used. - if (tid >= 7) + if (tid > 7) { tid = 0; } diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index 7281cb6c0..45cc7403b 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -377,7 +377,7 @@ StaWifiMac::Enqueue (Ptr packet, Mac48Address to) // Any value greater than 7 is invalid and likely indicates that // the packet had no QoS tag, so we revert to zero, which'll // mean that AC_BE is used. - if (tid >= 7) + if (tid > 7) { tid = 0; }