From: Eliad Peller <eliad@wizery.com>
Date: Wed, 3 Sep 2014 12:25:05 +0000 (+0300)
Subject: mac80211: adjust roc duration when combining ROCs
X-Git-Tag: v4.14-rc1~6619^2~75^2~133^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24ecd45e2eb194dcadefeb60a16f4ca751402413;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d7f437e..4e57b67 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2496,6 +2496,7 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
 
 				if (new_dur > 0) {
 					/* add right after tmp */
+					roc->duration = new_dur;
 					list_add(&roc->list, &tmp->list);
 				} else {
 					list_add_tail(&roc->list,