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

Commit 6962d602 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use oper_channel in mesh 



Using hw.conf.channel is wrong as it could be the
temporary channel if any function like the beacon
get function is called while scanning or during
other temporary out-of-channel activities.

Use oper_channel instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b17166a7

net/mac80211/mesh.c

+4 −3
Original line number Diff line number Diff line
@@ -349,17 +349,18 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, 
{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_supported_band *sband;

	struct ieee80211_channel *chan = local->oper_channel;

	u8 *pos;



	if (skb_tailroom(skb) < 3)

		return -ENOMEM;



	sband = local->hw.wiphy->bands[local->hw.conf.channel->band];

	sband = local->hw.wiphy->bands[chan->band];

	if (sband->band == IEEE80211_BAND_2GHZ) {

		pos = skb_put(skb, 2 + 1);

		*pos++ = WLAN_EID_DS_PARAMS;

		*pos++ = 1;

		*pos++ = ieee80211_frequency_to_channel(local->hw.conf.channel->center_freq);

		*pos++ = ieee80211_frequency_to_channel(chan->center_freq);

	}



	return 0;
@@ -603,7 +604,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) 
	sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;

	sdata->vif.bss_conf.basic_rates =

		ieee80211_mandatory_rates(sdata->local,

					  sdata->local->hw.conf.channel->band);

					  sdata->local->oper_channel->band);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |

						BSS_CHANGED_BEACON_ENABLED |

						BSS_CHANGED_HT |