From patchwork Tue Mar 18 13:53:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3853601 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0194A9F334 for ; Wed, 19 Mar 2014 17:45:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20B96200DF for ; Wed, 19 Mar 2014 17:45:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A261203B5 for ; Wed, 19 Mar 2014 17:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754680AbaCRN7d (ORCPT ); Tue, 18 Mar 2014 09:59:33 -0400 Received: from mail-ee0-f51.google.com ([74.125.83.51]:37325 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754302AbaCRN71 (ORCPT ); Tue, 18 Mar 2014 09:59:27 -0400 Received: by mail-ee0-f51.google.com with SMTP id c13so5359004eek.24 for ; Tue, 18 Mar 2014 06:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zH5Y3orZCWUMU+WXJIWKwMjQwSrWE35FbStd48k9bV4=; b=mhs3FD+HeAUYjoSlSDHVwASOT70Fmqu1dTsqXiWWozhQa9RRF/QlbBngcGic7vRHpH 3smgr2su+vHFM5dpUxWyevI4xBt/kwl8a5No9125iNNUab1rkwudA09mglTYPdF0yJIJ djjqKTg579xdHLB6kxWcV/dfHJUSMU89wedJY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zH5Y3orZCWUMU+WXJIWKwMjQwSrWE35FbStd48k9bV4=; b=d4cEwjYox1EO4me6WxKXzPzo6pPTRte5KAR8SRc8kilHrSbPH+5whCPTpiOmyD1cD5 JSGLQpyvZVX78U0ElJ6zM6jK1rxWQLngsGLfMR1Ixj5Rqq98JYYc/SPjaO+cmkfgVdbu 9P5vn8IixC93lbJkLdx0it8Rj6CPlGtqgfSIRTBEHLzWFVwY0fF8OHdIuzDsy3oc4/1J cM7E2fU5yzUQ1zJGH0qzDQ+rfCD+CCVTe0Gjj7IHmS0v/8VP1wRR3yFm3ouUAcCWXyTm EcW6m5A+tdFHsonYq4nnGmxXPFW7Rg/6szNYa6D66clydpccmgfOwlvYfRuik9DLZr8x 9DEg== X-Gm-Message-State: ALoCoQnbDT0wziZ8wzJPdKiYvzPCRxwHZxbuIF3D+Dh57zpKxgENEZcib/1CMv6ZfMrF//vwj9kjmQAAf3z+5tlRXCmAl10yP9xpsW3NOUAZjjNNG6LKKcI= X-Received: by 10.14.122.193 with SMTP id t41mr1481445eeh.110.1395151166397; Tue, 18 Mar 2014 06:59:26 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id x45sm35223167eeu.23.2014.03.18.06.59.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Mar 2014 06:59:25 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [RFC 15/21] mac80211: split CSA finalize function Date: Tue, 18 Mar 2014 14:53:18 +0100 Message-Id: <1395150804-24090-16-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395150804-24090-1-git-send-email-michal.kazior@tieto.com> References: <1395150804-24090-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Improves readability and modularity. Signed-off-by: Michal Kazior --- net/mac80211/cfg.c | 61 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 4cc4149..5f63e1d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3051,25 +3051,11 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif) } EXPORT_SYMBOL(ieee80211_csa_finish); -static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) +static int ieee80211_set_after_csa_beacon(struct ieee80211_sub_if_data *sdata, + u32 *changed) { - struct ieee80211_local *local = sdata->local; - int err, changed = 0; - - sdata_assert_lock(sdata); - lockdep_assert_held(&local->mtx); - - sdata->radar_required = sdata->csa_radar_required; - err = ieee80211_vif_change_channel(sdata, &changed); - if (WARN_ON(err < 0)) - return; - - if (!local->use_chanctx) { - local->_oper_chandef = sdata->csa_chandef; - ieee80211_hw_config(local, 0); - } + int err; - sdata->vif.csa_active = false; switch (sdata->vif.type) { case NL80211_IFTYPE_AP: err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon); @@ -3077,30 +3063,57 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) sdata->u.ap.next_beacon = NULL; if (err < 0) - return; - changed |= err; + return err; + *changed |= err; break; case NL80211_IFTYPE_ADHOC: err = ieee80211_ibss_finish_csa(sdata); if (err < 0) - return; - changed |= err; + return err; + *changed |= err; break; #ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: err = ieee80211_mesh_finish_csa(sdata); if (err < 0) - return; - changed |= err; + return err; + *changed |= err; break; #endif default: WARN_ON(1); + return -EINVAL; + } + + return 0; +} + +static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_local *local = sdata->local; + u32 changed = 0; + int err; + + sdata_assert_lock(sdata); + lockdep_assert_held(&local->mtx); + + sdata->radar_required = sdata->csa_radar_required; + err = ieee80211_vif_change_channel(sdata, &changed); + if (WARN_ON(err < 0)) return; + + if (!local->use_chanctx) { + local->_oper_chandef = sdata->csa_chandef; + ieee80211_hw_config(local, 0); } - ieee80211_bss_info_change_notify(sdata, changed); + sdata->vif.csa_active = false; + + err = ieee80211_set_after_csa_beacon(sdata, &changed); + if (err) + return; + ieee80211_bss_info_change_notify(sdata, changed); cfg80211_ch_switch_notify(sdata->dev, &sdata->csa_chandef); }