diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-09-03 14:25:05 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-09-05 13:52:08 +0200 |
| commit | 24ecd45e2eb194dcadefeb60a16f4ca751402413 (patch) | |
| tree | 1506f7f444c89ad035d4c1ced9347435601f2b14 /net/mac80211 | |
| parent | cfg80211: avoid duplicate entries on regdomain intersection (diff) | |
| download | linux-24ecd45e2eb194dcadefeb60a16f4ca751402413.tar.xz linux-24ecd45e2eb194dcadefeb60a16f4ca751402413.zip | |
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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index d7f437ef6e7e..4e57b67a91dd 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, |