On Thu, 2022-09-29 at 08:16 -0700, greearb@xxxxxxxxxxxxxxx wrote: > From: Ben Greear <greearb@xxxxxxxxxxxxxxx> > > The IEEE80211_STA_DISABLE_EHT flag was not enabled when it should > be, so the bandwidth change failed, and STA disconnected. > > Use an OR approach instead of just assinging the flags, to typo - assigning > allow easier setting of certain flags such as the EHT > one. This *looked* reasonable, but doesn't apply in any way? Can you rebase on wireless/main please? > Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx> > --- > net/mac80211/mlme.c | 63 ++++++++++++++++++++++----------------------- > 1 file changed, 31 insertions(+), 32 deletions(-) > > diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c > index 011827137da7..9ac99f48c63b 100644 > --- a/net/mac80211/mlme.c > +++ b/net/mac80211/mlme.c > @@ -167,7 +167,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, > struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; > struct cfg80211_chan_def vht_chandef; > struct ieee80211_sta_ht_cap sta_ht_cap; > - u32 ht_cfreq, ret; > + u32 ht_cfreq; > + u32 ret = 0; Could keep that on one line still? Any particular reason not to? > > if (cfg80211_chandef_identical(chandef, &vht_chandef)) { > - ret = 0; > goto out; > } can drop the braces now johannes