Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4ac6f2e authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Johannes Berg
Browse files

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: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent aa1702dd

net/mac80211/ibss.c

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	case NL80211_CHAN_WIDTH_5:

	case NL80211_CHAN_WIDTH_10:

		cfg80211_chandef_create(&chandef, cbss->channel,

					NL80211_CHAN_WIDTH_20_NOHT);

					NL80211_CHAN_NO_HT);

		chandef.width = sdata->u.ibss.chandef.width;

		break;

	case NL80211_CHAN_WIDTH_80:
@@ -437,7 +437,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	default:

		/* fall back to 20 MHz for unsupported modes */

		cfg80211_chandef_create(&chandef, cbss->channel,

					NL80211_CHAN_WIDTH_20_NOHT);

					NL80211_CHAN_NO_HT);

		break;

	}