Hi Michal, On Wed, 2014-01-15 at 13:04 +0100, Michal Kazior wrote: > Other interface modes are checked against failure. > This should avoid false-positive channel switch > events where IBSS CSA actually failed. > > Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> > --- > net/mac80211/cfg.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c > index 8c78572..2ab5f49 100644 > --- a/net/mac80211/cfg.c > +++ b/net/mac80211/cfg.c > @@ -3040,7 +3040,9 @@ void ieee80211_csa_finalize_work(struct work_struct *work) > goto unlock; > break; > case NL80211_IFTYPE_ADHOC: > - ieee80211_ibss_finish_csa(sdata); > + err = ieee80211_ibss_finish_csa(sdata); > + if (err < 0) > + goto unlock; > break; > #ifdef CONFIG_MAC80211_MESH > case NL80211_IFTYPE_MESH_POINT: This makes sense, but there have been lots of changes in this code that Johannes just applied on mac80211-next.git. Maybe it would be better to rebase your patches on top of mac80211-next or wait until they get into wireless-testing? -- Luca. -- 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