| Message ID | 1396259841-6359-5-git-send-email-michal.kazior@tieto.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 2014-03-31 at 11:57 +0200, Michal Kazior wrote: > It doesn't make much sense to leave a cripled > interface running. > > As a side effect this will unblock tx queues with > CSA reason immediately after failure instead of > until after userspace requests interface to stop. > > This also gives userspace an opportunity to > indirectly see CSA failure. > > Signed-off-by: Michal Kazior <michal.kazior@tieto.com> > --- [...] > @@ -3100,7 +3100,7 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) > sdata->radar_required = sdata->csa_radar_required; > err = ieee80211_vif_change_channel(sdata, &changed); > if (WARN_ON(err < 0)) > - return; > + return err; Didn't we agree to remove the WARN_ON() from here? -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 31 March 2014 13:45, Luca Coelho <luca@coelho.fi> wrote: > On Mon, 2014-03-31 at 11:57 +0200, Michal Kazior wrote: >> It doesn't make much sense to leave a cripled >> interface running. >> >> As a side effect this will unblock tx queues with >> CSA reason immediately after failure instead of >> until after userspace requests interface to stop. >> >> This also gives userspace an opportunity to >> indirectly see CSA failure. >> >> Signed-off-by: Michal Kazior <michal.kazior@tieto.com> >> --- > > [...] > >> @@ -3100,7 +3100,7 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) >> sdata->radar_required = sdata->csa_radar_required; >> err = ieee80211_vif_change_channel(sdata, &changed); >> if (WARN_ON(err < 0)) >> - return; >> + return err; > > Didn't we agree to remove the WARN_ON() from here? I forgot, sorry. Now I definitely need to respin, again :) Micha? -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2014-03-31 at 11:57 +0200, Michal Kazior wrote:
> It doesn't make much sense to leave a cripled
typo: crippled :)
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 2fd8e08..821143c 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3088,7 +3088,7 @@ static int ieee80211_set_after_csa_beacon(struct ieee80211_sub_if_data *sdata, return 0; } -static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) +static int ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; u32 changed = 0; @@ -3100,7 +3100,7 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) sdata->radar_required = sdata->csa_radar_required; err = ieee80211_vif_change_channel(sdata, &changed); if (WARN_ON(err < 0)) - return; + return err; if (!local->use_chanctx) { local->_oper_chandef = sdata->csa_chandef; @@ -3111,7 +3111,7 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) err = ieee80211_set_after_csa_beacon(sdata, &changed); if (err) - return; + return err; ieee80211_bss_info_change_notify(sdata, changed); cfg80211_ch_switch_notify(sdata->dev, &sdata->csa_chandef); @@ -3120,6 +3120,8 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) ieee80211_wake_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP, IEEE80211_QUEUE_STOP_REASON_CSA); + + return 0; } void ieee80211_csa_finalize_work(struct work_struct *work) @@ -3128,6 +3130,7 @@ void ieee80211_csa_finalize_work(struct work_struct *work) container_of(work, struct ieee80211_sub_if_data, csa_finalize_work); struct ieee80211_local *local = sdata->local; + int err; sdata_lock(sdata); mutex_lock(&local->mtx); @@ -3139,7 +3142,12 @@ void ieee80211_csa_finalize_work(struct work_struct *work) if (!ieee80211_sdata_running(sdata)) goto unlock; - ieee80211_csa_finalize(sdata); + err = ieee80211_csa_finalize(sdata); + if (err) { + sdata_info(sdata, "failed to finalize CSA, disconnecting\n"); + cfg80211_stop_iface(local->hw.wiphy, &sdata->wdev, GFP_KERNEL); + goto unlock; + } unlock: mutex_unlock(&local->mtx);
It doesn't make much sense to leave a cripled interface running. As a side effect this will unblock tx queues with CSA reason immediately after failure instead of until after userspace requests interface to stop. This also gives userspace an opportunity to indirectly see CSA failure. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> --- v3: * rebase to use gfp_t argument net/mac80211/cfg.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)