On Mon, 2014-02-03 at 10:58 +0100, Michal Kazior wrote:
> Managed interface channel switching code was
> mostly redundant.
>
> This makes it easier to do more channel switching
> code refactoring.
>
> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx>
> ---
Looks good! Just some nitpicks below (and I left the timstamp discussion
between you and Johannes ;)
[...]
> @@ -3011,51 +3012,89 @@ 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);
> mutex_unlock(&local->mtx);
> - if (WARN_ON(err < 0))
> - return;
> +
> + sdata->vif.csa_active = false;
> +
> + if (WARN_ON(err < 0)) {
> + sdata_info(sdata, "vif channel switch failed\n");
> + return err;
> + }
Maybe WARN(err < 0, "vif channel switch failed\n") instead?
[...]
> +void ieee80211_csa_disconnect(struct ieee80211_sub_if_data *sdata)
> +{
> + struct ieee80211_local *local = sdata->local;
> + struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
> +
> + switch (sdata->vif.type) {
> + case NL80211_IFTYPE_STATION:
> + case NL80211_IFTYPE_P2P_CLIENT:
> + ieee80211_queue_work(&local->hw,
> + &ifmgd->csa_connection_drop_work);
> + break;
> + default:
> + /* XXX: other iftypes should be halted too */
Good point. This case would suck, but we need to do something because
the stations will think that we're on the different channel at this
point. But maybe instead the userspace should be notified instead of
halting here? It could retry with a count 0, for example.
[...]
> @@ -3072,16 +3112,17 @@ 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)
> + ieee80211_csa_disconnect(sdata);
>
> unlock:
> sdata_unlock(sdata);
> }
>
> -int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
> - struct cfg80211_csa_settings *params)
> +int __ieee80211_channel_switch(struct ieee80211_sub_if_data *sdata,
> + struct cfg80211_csa_settings *params)
Why did you have to split this function? All cases where you call
__ieee80211_channel_switch() you lock->call->unlock anyway.
[...]
> @@ -998,6 +944,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
> if (res)
> return;
>
> + /* FIXME: This check should be moved to cfg80211 */
This is not really related to this patch.
> if (!cfg80211_chandef_usable(local->hw.wiphy, &csa_ie.chandef,
> IEEE80211_CHAN_DISABLED)) {
> sdata_info(sdata,
[...]
> static u32 ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
> @@ -1758,6 +1690,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
> del_timer_sync(&sdata->u.mgd.timer);
> del_timer_sync(&sdata->u.mgd.chswitch_timer);
>
> + sdata->vif.csa_active = false;
> sdata->vif.bss_conf.dtim_period = 0;
> sdata->vif.bss_conf.beacon_rate = NULL;
This is also not directly related. It's actually a bug fix for the
existing code, isn't it?
[...]
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index 8b32a1f..28ab3a9 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -11240,7 +11240,9 @@ void cfg80211_ch_switch_notify(struct net_device *dev,
> if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
> wdev->iftype != NL80211_IFTYPE_P2P_GO &&
> wdev->iftype != NL80211_IFTYPE_ADHOC &&
> - wdev->iftype != NL80211_IFTYPE_MESH_POINT))
> + wdev->iftype != NL80211_IFTYPE_MESH_POINT &&
> + wdev->iftype != NL80211_IFTYPE_STATION &&
> + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))
> return;
You should update the NL80211_CMD_CH_SWITCH_NOTIFY documentation in
nl80211.h.
--
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
