mac80211: make remain_on_channel() op pass vif param

[deliverable/linux.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 80e0618b25ba47d7edfd2e5a27a6552ee0a88983..18926aea480cf890fd86807a08a02cda184c97cf 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2287,7 +2287,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
        if (!duration)
                duration = 10;
 
-       ret = drv_remain_on_channel(local, channel, channel_type, duration);
+       ret = drv_remain_on_channel(local, sdata, channel, channel_type,
+                                   duration);
        if (ret) {
                kfree(roc);
                return ret;
@@ -2298,7 +2299,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
 
  out_check_combine:
        list_for_each_entry(tmp, &local->roc_list, list) {
-               if (tmp->chan != channel || tmp->chan_type != channel_type)
+               if (tmp->chan != channel || tmp->chan_type != channel_type ||
+                   tmp->sdata != sdata)
                        continue;
 
                /*