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

Commit 601513aa authored by Emanuel Taube's avatar Emanuel Taube Committed by Johannes Berg
Browse files

mac80211: Add the DS Params for mesh to every band 



There seems to be no reason, why it has to be limited to 2.4 GHz.

Signed-off-by: default avatarEmanuel Taube <emanuel.taube@gmail.com>
[remove 'local' variable]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 45b5028e

net/mac80211/mesh.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -393,8 +393,6 @@ mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
int mesh_add_ds_params_ie(struct sk_buff *skb,

int mesh_add_ds_params_ie(struct sk_buff *skb,

			  struct ieee80211_sub_if_data *sdata)

			  struct ieee80211_sub_if_data *sdata)

{

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_supported_band *sband;

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_channel *chan;

	struct ieee80211_channel *chan;

	u8 *pos;

	u8 *pos;
@@ -411,13 +409,10 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, 
	chan = chanctx_conf->def.chan;

	chan = chanctx_conf->def.chan;

	rcu_read_unlock();

	rcu_read_unlock();





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

	if (sband->band == IEEE80211_BAND_2GHZ) {

	pos = skb_put(skb, 2 + 1);

	pos = skb_put(skb, 2 + 1);

	*pos++ = WLAN_EID_DS_PARAMS;

	*pos++ = WLAN_EID_DS_PARAMS;

	*pos++ = 1;

	*pos++ = 1;

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

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

	}





	return 0;

	return 0;

}

}