| Message ID | 1386935675-24548-3-git-send-email-luciano.coelho@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
> The return value of ieee80211_ibss_csa_beacon is not aligned with the > return value of ieee80211_csa_beacon(). For consistency and to be You probably mean "ieee80211_assign_beacon()" here? There is no ieee80211_csa_beacon(), but AP uses ieee80211_assign_beacon(). Same goes for the commit message of patch 4. Content looks good. Cheers, Simon -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2013-12-13 at 18:12 +0100, Simon Wunderlich wrote: > > The return value of ieee80211_ibss_csa_beacon is not aligned with the > > return value of ieee80211_csa_beacon(). For consistency and to be > > You probably mean "ieee80211_assign_beacon()" here? There is no > ieee80211_csa_beacon(), but AP uses ieee80211_assign_beacon(). Same goes for > the commit message of patch 4. Content looks good. Heh! Good catch. I'll change it. -- Luca.
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; }
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(-)