mac80211: combine roc with the "next roc" if possible
authorEliad Peller <eliad@wizery.com>
Wed, 3 Sep 2014 12:25:06 +0000 (15:25 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 5 Sep 2014 11:52:09 +0000 (13:52 +0200)
commiteaa336b0f5087addb32217e6a70845ed57249f76
treead4c34139f02db933f5a061058bba0b9c96a9825
parent24ecd45e2eb194dcadefeb60a16f4ca751402413
mac80211: combine roc with the "next roc" if possible

If the remaining time in the current roc is not long
enough, mac80211 adds the new roc right after it
(if they have similar params).

However, in case of multiple rocs, the "next roc"
is not considered, resulting in multiple rocs,
each one with its own duration.

Refactor the code a bit and consider the next roc,
so a single max roc will be used instead of
multiple rocs (which might last much longer).

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>
net/mac80211/cfg.c