Skip to content

Commit

Permalink
wifi: mac80211: remove erroneous sband/link validation
Browse files Browse the repository at this point in the history
In sta_apply_parameters(), we really no longer need to
check that the link or sband exists, in fact, that's
harmful if link 0 doesn't exist, since then this will
fail.

Just remove this check, it was added for validation of
the sband where used, but it's not used here, it's now
only used in sta_link_apply_parameters() which has an
own lookup and check.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jul 22, 2022
1 parent 4ca04ed commit 45b1257
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1684,21 +1684,9 @@ static int sta_apply_parameters(struct ieee80211_local *local,
struct sta_info *sta,
struct station_parameters *params)
{
int ret = 0;
struct ieee80211_supported_band *sband;
struct ieee80211_sub_if_data *sdata = sta->sdata;
u32 link_id = params->link_sta_params.link_id < 0 ?
0 : params->link_sta_params.link_id;
struct ieee80211_link_data *link;
u32 mask, set;

link = sdata_dereference(sdata->link[link_id], sdata);
if (!link)
return -ENOLINK;

sband = ieee80211_get_link_sband(link);
if (!sband)
return -EINVAL;
int ret = 0;

mask = params->sta_flags_mask;
set = params->sta_flags_set;
Expand Down

0 comments on commit 45b1257

Please sign in to comment.