From: Johannes Berg Date: Wed, 20 Mar 2024 07:14:03 +0000 (+0200) Subject: wifi: mac80211: don't ask driver about no-op link changes X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f51c87a156c2ee30bf6a66694c64856177c5303;p=linux.git wifi: mac80211: don't ask driver about no-op link changes If the links won't actually change, nothing will happen. This was previously done in the inner function (twice in some cases), but we shouldn't bother the driver with it. Clean that up. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://msgid.link/20240320091155.a8190a312a27.If4e6f5ce8228eda7afac0fc8c17dd731c5da9ed9@changeid Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/link.c b/net/mac80211/link.c index db49bcec5db43..43f9672fc7f19 100644 --- a/net/mac80211/link.c +++ b/net/mac80211/link.c @@ -450,10 +450,13 @@ int ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links) if (WARN_ON(!active_links)) return -EINVAL; + old_active = sdata->vif.active_links; + if (old_active == active_links) + return 0; + if (!drv_can_activate_links(local, sdata, active_links)) return -EINVAL; - old_active = sdata->vif.active_links; if (old_active & active_links) { /* * if there's at least one link that stays active across