From: Johannes Berg This isn't activate() in the sense of setting the link to actually be active, since active links of a station the intersection of valid links of the station and the interface's active links. For SMD Transition, we're going to have to track those of a station separately, and activate() becomes more confusing. Rename this to ieee80211_sta_set_link_valid(). Reviewed-by: Miriam Rachel Korenblit Signed-off-by: Johannes Berg --- net/mac80211/cfg.c | 4 ++-- net/mac80211/mlme.c | 4 ++-- net/mac80211/sta_info.c | 2 +- net/mac80211/sta_info.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 6e466f8e1653..a4f242a23957 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -6122,8 +6122,8 @@ ieee80211_add_link_station(struct wiphy *wiphy, struct net_device *dev, rate_control_rate_init(link_sta); } - /* ieee80211_sta_activate_link frees the link upon failure */ - return ieee80211_sta_activate_link(sta, params->link_id); + /* ieee80211_sta_set_link_valid frees the link upon failure */ + return ieee80211_sta_set_link_valid(sta, params->link_id); } static int diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 8eda8154ba3d..2625103f6307 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -7223,7 +7223,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, } if (link_id != assoc_data->assoc_link_id) { - err = ieee80211_sta_activate_link(sta, link_id); + err = ieee80211_sta_set_link_valid(sta, link_id); if (err) goto out_err; } @@ -11218,7 +11218,7 @@ ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata, if (add_links_data->link[link_id].status != WLAN_STATUS_SUCCESS) goto disconnect; - if (ieee80211_sta_activate_link(sta, link_id)) + if (ieee80211_sta_set_link_valid(sta, link_id)) goto disconnect; changed |= ieee80211_link_set_associated(link, cbss); diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 23166fc39729..572455549c63 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -3473,7 +3473,7 @@ void ieee80211_sta_free_link(struct sta_info *sta, unsigned int link_id) sta_remove_link(sta, link_id, false); } -int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id) +int ieee80211_sta_set_link_valid(struct sta_info *sta, unsigned int link_id) { struct ieee80211_sub_if_data *sdata = sta->sdata; struct link_sta_info *link_sta; diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 8c6a9fee6b29..0a286185125d 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -1008,7 +1008,7 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, int ieee80211_sta_allocate_link(struct sta_info *sta, unsigned int link_id); void ieee80211_sta_free_link(struct sta_info *sta, unsigned int link_id); -int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id); +int ieee80211_sta_set_link_valid(struct sta_info *sta, unsigned int link_id); void ieee80211_sta_remove_link(struct sta_info *sta, unsigned int link_id); void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta); -- 2.56.0