All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luciano Coelho <luciano.coelho@intel.com>
To: linux-wireless@vger.kernel.org, sw@simonwunderlich.de,
	yeohchunyeow@gmail.com
Cc: yeohchunyeow@cozybit.com
Subject: [PATCH v9 2/5] mac80211: align ieee80211_ibss_csa_beacon() with ieee80211_csa_beacon()
Date: Fri, 13 Dec 2013 13:54:32 +0200	[thread overview]
Message-ID: <1386935675-24548-3-git-send-email-luciano.coelho@intel.com> (raw)
In-Reply-To: <1386935675-24548-1-git-send-email-luciano.coelho@intel.com>

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 <luciano.coelho@intel.com>
---
 net/mac80211/ibss.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 0c3a45c..262fd56 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;
 }
@@ -563,6 +563,9 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)
 	if (err < 0)
 		return err;
 
+	if (err)
+		ieee80211_bss_info_change_notify(sdata, err);
+
 	return 0;
 }
 
-- 
1.8.5.1


  parent reply	other threads:[~2013-12-13 11:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-13 11:54 [PATCH v9 0/5] CSA Beacon Count changes Luciano Coelho
2013-12-13 11:54 ` [PATCH v9 1/5] mac80211: refactor ieee80211_ibss_process_chanswitch() Luciano Coelho
2013-12-13 11:54 ` Luciano Coelho [this message]
2013-12-13 17:12   ` [PATCH v9 2/5] mac80211: align ieee80211_ibss_csa_beacon() with ieee80211_csa_beacon() Simon Wunderlich
2013-12-13 19:09     ` Coelho, Luciano
2013-12-13 11:54 ` [PATCH v9 3/5] mac80211: refactor ieee80211_mesh_process_chanswitch() Luciano Coelho
2013-12-13 11:54 ` [PATCH v9 4/5] mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_csa_beacon() Luciano Coelho
2013-12-13 11:54 ` [PATCH v9 5/5] mac80211: only set CSA beacon when at least one beacon must be transmitted Luciano Coelho
2013-12-13 12:34 ` [PATCH v9 0/5] CSA Beacon Count changes Luca Coelho
2013-12-13 17:23 ` Simon Wunderlich
2013-12-13 19:10   ` Coelho, Luciano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386935675-24548-3-git-send-email-luciano.coelho@intel.com \
    --to=luciano.coelho@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=sw@simonwunderlich.de \
    --cc=yeohchunyeow@cozybit.com \
    --cc=yeohchunyeow@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.