Skip to content

Commit 601513a

Browse files
em84jmberg-intel
authored andcommitted
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: Emanuel Taube <emanuel.taube@gmail.com> [remove 'local' variable] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 45b5028 commit 601513a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

net/mac80211/mesh.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
393393
int mesh_add_ds_params_ie(struct sk_buff *skb,
394394
struct ieee80211_sub_if_data *sdata)
395395
{
396-
struct ieee80211_local *local = sdata->local;
397-
struct ieee80211_supported_band *sband;
398396
struct ieee80211_chanctx_conf *chanctx_conf;
399397
struct ieee80211_channel *chan;
400398
u8 *pos;
@@ -411,13 +409,10 @@ int mesh_add_ds_params_ie(struct sk_buff *skb,
411409
chan = chanctx_conf->def.chan;
412410
rcu_read_unlock();
413411

414-
sband = local->hw.wiphy->bands[chan->band];
415-
if (sband->band == IEEE80211_BAND_2GHZ) {
416-
pos = skb_put(skb, 2 + 1);
417-
*pos++ = WLAN_EID_DS_PARAMS;
418-
*pos++ = 1;
419-
*pos++ = ieee80211_frequency_to_channel(chan->center_freq);
420-
}
412+
pos = skb_put(skb, 2 + 1);
413+
*pos++ = WLAN_EID_DS_PARAMS;
414+
*pos++ = 1;
415+
*pos++ = ieee80211_frequency_to_channel(chan->center_freq);
421416

422417
return 0;
423418
}

0 commit comments

Comments
 (0)