diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-01-13 19:42:59 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-04 21:48:05 +0100 |
| commit | b58e81e96a81c80886011ad87cdbe73585dec4f7 (patch) | |
| tree | 3c76ef32385f51e4fb6a01eb08050cd3b5dd9580 /net | |
| parent | 0cb4d4dceb4b7a31c6af0159cac2cec5fbe294a2 (diff) | |
| download | op-kernel-dev-b58e81e96a81c80886011ad87cdbe73585dec4f7.zip op-kernel-dev-b58e81e96a81c80886011ad87cdbe73585dec4f7.tar.gz | |
mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_assign_beacon()
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 <sw@simonwunderlich.de>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 319adf4..b421993 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1104,12 +1104,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, |
