Skip to content

Commit a84937b

Browse files
Matthias Kaehlckepundiramit
authored andcommitted
UPSTREAM: mac80211: ibss: Fix channel type enum in ieee80211_sta_join_ibss()
cfg80211_chandef_create() expects an 'enum nl80211_channel_type' as channel type however in ieee80211_sta_join_ibss() NL80211_CHAN_WIDTH_20_NOHT is passed in two occasions, which is of the enum type 'nl80211_chan_width'. Change the value to NL80211_CHAN_NO_HT (20 MHz, non-HT channel) of the channel type enum. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit a4ac6f2e53e568a77a2eb3710efd99ca08634c0a) Bug: 78886293 Change-Id: Iab3fc750c2cd8b32cf501b9739445a7b5c83e8cd Signed-off-by: Alistair Strachan <astrachan@google.com>
1 parent 44371ae commit a84937b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/mac80211/ibss.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
427427
case NL80211_CHAN_WIDTH_5:
428428
case NL80211_CHAN_WIDTH_10:
429429
cfg80211_chandef_create(&chandef, cbss->channel,
430-
NL80211_CHAN_WIDTH_20_NOHT);
430+
NL80211_CHAN_NO_HT);
431431
chandef.width = sdata->u.ibss.chandef.width;
432432
break;
433433
case NL80211_CHAN_WIDTH_80:
@@ -438,7 +438,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
438438
default:
439439
/* fall back to 20 MHz for unsupported modes */
440440
cfg80211_chandef_create(&chandef, cbss->channel,
441-
NL80211_CHAN_WIDTH_20_NOHT);
441+
NL80211_CHAN_NO_HT);
442442
break;
443443
}
444444

0 commit comments

Comments
 (0)