From patchwork Thu Nov 14 12:09:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 3182081 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 57BCAC045B for ; Thu, 14 Nov 2013 12:10:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48F7620977 for ; Thu, 14 Nov 2013 12:10:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64FD32097A for ; Thu, 14 Nov 2013 12:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753151Ab3KNMKR (ORCPT ); Thu, 14 Nov 2013 07:10:17 -0500 Received: from emh01.mail.saunalahti.fi ([62.142.5.107]:52518 "EHLO emh01.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487Ab3KNMKM (ORCPT ); Thu, 14 Nov 2013 07:10:12 -0500 Received: from porter.coelho.fi (a88-113-229-85.elisa-laajakaista.fi [88.113.229.85]) by emh01.mail.saunalahti.fi (Postfix) with ESMTP id 15F449004D; Thu, 14 Nov 2013 14:10:11 +0200 (EET) From: Luciano Coelho To: linux-wireless@vger.kernel.org, sw@simonwunderlich.de, johannes@sipsolutions.net, yeohchunyeow@gmail.com Cc: yeohchunyeow@cozybit.com Subject: [PATCH v5 4/5] mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_csa_beacon() Date: Thu, 14 Nov 2013 14:09:35 +0200 Message-Id: <1384430976-13708-4-git-send-email-luciano.coelho@intel.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1384430976-13708-1-git-send-email-luciano.coelho@intel.com> References: <1384430976-13708-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_mesh_csa_beacon is not aligned with the return value of ieee80211_csa_beacon() and ieee80211_ibss_csa_beacon(). For consistency and to be able to use both functions with similar code, change ieee80211_mesh_csa_beacon() not to send the bss changed notification itself, but return what has changed so the caller can send the notification instead. Change-Id: If4c111fd874a3e17a5df98d306f7f1c8fcaa6a1a Signed-off-by: Luciano Coelho --- net/mac80211/cfg.c | 2 ++ net/mac80211/mesh.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a5aa766..6eb8e08 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3155,6 +3155,8 @@ int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, ifmsh->csa_role = IEEE80211_MESH_CSA_ROLE_NONE; return err; } + changed |= err; + break; #endif default: diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 5852080..94dff7f 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1091,12 +1091,10 @@ int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata, return ret; } - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON); - if (csa_action) ieee80211_send_action_csa(sdata, csa_settings); - return 0; + return BSS_CHANGED_BEACON; } static int mesh_fwd_csa_frame(struct ieee80211_sub_if_data *sdata,