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 d7f437ef6e7e7dba5a2f951ad171bfae7cad3524..4e57b67a91dd52be341ead3c1e39ad6e6e57f39a 100644 (file)
--- 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,