From patchwork Thu Dec 5 15:07:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Coelho, Luciano" X-Patchwork-Id: 3288841 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 C7F909F37A for ; Thu, 5 Dec 2013 15:07:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DBB3204A7 for ; Thu, 5 Dec 2013 15:07:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1E6320481 for ; Thu, 5 Dec 2013 15:07:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932603Ab3LEPHd (ORCPT ); Thu, 5 Dec 2013 10:07:33 -0500 Received: from emh03.mail.saunalahti.fi ([62.142.5.109]:56834 "EHLO emh03.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932592Ab3LEPHb (ORCPT ); Thu, 5 Dec 2013 10:07:31 -0500 Received: from porter.coelho.fi (a88-113-229-85.elisa-laajakaista.fi [88.113.229.85]) by emh03.mail.saunalahti.fi (Postfix) with ESMTP id EB8DE18882C; Thu, 5 Dec 2013 17:07:29 +0200 (EET) From: Luciano Coelho To: linux-wireless@vger.kernel.org, sw@simonwunderlich.de, yeohchunyeow@gmail.com Cc: yeohchunyeow@cozybit.com Subject: [PATCH v7 4/5] mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_csa_beacon() Date: Thu, 5 Dec 2013 17:07:23 +0200 Message-Id: <1386256044-8651-5-git-send-email-luciano.coelho@intel.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386256044-8651-1-git-send-email-luciano.coelho@intel.com> References: <1386256044-8651-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/mesh.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 980cc12..5476ad9 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1089,12 +1089,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,