Commit 24ecd45e authored Sep 03, 2014 by Eliad Peller Committed by Johannes Berg Sep 05, 2014

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>

parent a62a1aed

net/mac80211/cfg.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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,