On Mon, Nov 19, 2012 at 4:44 PM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > On Sun, 2012-11-18 at 13:57 +0200, Eliad Peller wrote: >> Drivers (e.g. wl12xx) might need to know the vif >> to roc on (mainly in order to configure the >> rx filters correctly). >> >> Add the vif to the op params, and update the current >> users (iwlwifi) to use the new api. > > Hmm, ok, but I think then the ROC merge logic may have to be changed? > yeah, i guess you're right. @@ -2247,7 +2247,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; should something like this be enough? Eliad. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html