aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-01-23 07:23:48 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-01-23 07:26:25 -0500
commit3d6dc3431e944cf800637404167447f4badffdba (patch)
tree99faf03a01db2cf0e5a8d15da0f244decefcd384 /net/mac80211
parentc5309ba78742483514b8f7e447ebe56685894298 (diff)
mac80211: fix per-TID RX-MSDU counter
In the case of non-QoS association, the counter was actually wrong. The right index isn't security_idx but seqno_idx, as security_idx will be 0 for data frames, while 16 is needed. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3d79d498e7f6..ed516ae80a3b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2310,12 +2310,12 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
2310 return RX_DROP_MONITOR; 2310 return RX_DROP_MONITOR;
2311 2311
2312 if (rx->sta) { 2312 if (rx->sta) {
2313 /* The security index has the same property as needed 2313 /* The seqno index has the same property as needed
2314 * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS 2314 * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS
2315 * for non-QoS-data frames. Here we know it's a data 2315 * for non-QoS-data frames. Here we know it's a data
2316 * frame, so count MSDUs. 2316 * frame, so count MSDUs.
2317 */ 2317 */
2318 rx->sta->rx_msdu[rx->security_idx]++; 2318 rx->sta->rx_msdu[rx->seqno_idx]++;
2319 } 2319 }
2320 2320
2321 /* 2321 /*