From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from emh01.mail.saunalahti.fi ([62.142.5.107]:45665 "EHLO emh01.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752606Ab3LMTOA (ORCPT ); Fri, 13 Dec 2013 14:14:00 -0500 From: Luciano Coelho To: linux-wireless@vger.kernel.org, sw@simonwunderlich.de, yeohchunyeow@gmail.com Cc: yeohchunyeow@cozybit.com Subject: [PATCH v10 4/5] mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_assign_beacon() Date: Fri, 13 Dec 2013 21:13:53 +0200 Message-Id: <1386962034-7141-5-git-send-email-luciano.coelho@intel.com> (sfid-20131213_201410_034450_702216BA) In-Reply-To: <1386962034-7141-1-git-send-email-luciano.coelho@intel.com> References: <1386962034-7141-1-git-send-email-luciano.coelho@intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: The return value of ieee80211_mesh_csa_beacon is not aligned with the return value of ieee80211_assign_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. Tested by: Simon Wunderlich Acked by: Simon Wunderlich 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 d0c4131..f255bd9 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1096,12 +1096,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, -- 1.8.5.1