From patchwork Tue Dec 3 13:48:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 3276141 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 15116C0D4A for ; Tue, 3 Dec 2013 13:48:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 041F2200FE for ; Tue, 3 Dec 2013 13:48:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 616FB20379 for ; Tue, 3 Dec 2013 13:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425Ab3LCNsb (ORCPT ); Tue, 3 Dec 2013 08:48:31 -0500 Received: from emh02.mail.saunalahti.fi ([62.142.5.108]:52952 "EHLO emh02.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753217Ab3LCNs3 (ORCPT ); Tue, 3 Dec 2013 08:48:29 -0500 Received: from porter.coelho.fi (a88-113-229-85.elisa-laajakaista.fi [88.113.229.85]) by emh02.mail.saunalahti.fi (Postfix) with ESMTP id B6A0781874; Tue, 3 Dec 2013 15:48:27 +0200 (EET) From: Luciano Coelho To: linux-wireless@vger.kernel.org, sw@simonwunderlich.de, yeohchunyeow@gmail.com Cc: yeohchunyeow@cozybit.com Subject: [PATCH v6 2/5] mac80211: align ieee80211_ibss_csa_beacon() with ieee80211_csa_beacon() Date: Tue, 3 Dec 2013 15:48:19 +0200 Message-Id: <1386078502-19845-3-git-send-email-luciano.coelho@intel.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1386078502-19845-1-git-send-email-luciano.coelho@intel.com> References: <1386078502-19845-1-git-send-email-luciano.coelho@intel.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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The return value of ieee80211_ibss_csa_beacon is not aligned with the return value of ieee80211_csa_beacon(). For consistency and to be able to use both functions with similar code, change ieee80211_ibss_csa_beacon() not to send the bss changed notification itself, but return what has changed so the caller can send the notification instead. Signed-off-by: Luciano Coelho --- net/mac80211/ibss.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 3514aab..23e035f 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -522,7 +522,7 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata, if (csa_settings) ieee80211_send_action_csa(sdata, csa_settings); - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON); + return BSS_CHANGED_BEACON; out: return ret; } @@ -559,11 +559,17 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) /* generate the beacon */ err = ieee80211_ibss_csa_beacon(sdata, NULL); - sdata_unlock(sdata); if (err < 0) - return err; + goto out; - return 0; + if (err) { + ieee80211_bss_info_change_notify(sdata, err); + err = 0; + } +out: + sdata_unlock(sdata); + + return err; } void ieee80211_ibss_stop(struct ieee80211_sub_if_data *sdata)