mac80211: adjust roc duration when combining ROCs

The new duration (remaining duration after the current
ROC ends) was calculated but not used, making the
optimization worthless.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Eliad Peller 2014-09-03 15:25:05 +03:00 committed by Johannes Berg
parent a62a1aed37
commit 24ecd45e2e
1 changed files with 1 additions and 0 deletions

View File

@ -2496,6 +2496,7 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
if (new_dur > 0) { if (new_dur > 0) {
/* add right after tmp */ /* add right after tmp */
roc->duration = new_dur;
list_add(&roc->list, &tmp->list); list_add(&roc->list, &tmp->list);
} else { } else {
list_add_tail(&roc->list, list_add_tail(&roc->list,