diff options
author | Emanuel Taube <emanuel.taube@gmail.com> | 2013-02-06 08:17:17 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 12:44:54 -0500 |
commit | 601513aa208f27ea87400a410d42c978421530ec (patch) | |
tree | 81c2f38fbf7f5c45238fdb9b8efa3d3c1bcadc11 /net | |
parent | 45b5028e86292284f4d5794047d5dfd742c22421 (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/mesh.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 0c51b78b8fdc..2bf0158c3f82 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
@@ -393,8 +393,6 @@ mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) | |||
393 | int mesh_add_ds_params_ie(struct sk_buff *skb, | 393 | int mesh_add_ds_params_ie(struct sk_buff *skb, |
394 | struct ieee80211_sub_if_data *sdata) | 394 | struct ieee80211_sub_if_data *sdata) |
395 | { | 395 | { |
396 | struct ieee80211_local *local = sdata->local; | ||
397 | struct ieee80211_supported_band *sband; | ||
398 | struct ieee80211_chanctx_conf *chanctx_conf; | 396 | struct ieee80211_chanctx_conf *chanctx_conf; |
399 | struct ieee80211_channel *chan; | 397 | struct ieee80211_channel *chan; |
400 | u8 *pos; | 398 | u8 *pos; |
@@ -411,13 +409,10 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, | |||
411 | chan = chanctx_conf->def.chan; | 409 | chan = chanctx_conf->def.chan; |
412 | rcu_read_unlock(); | 410 | rcu_read_unlock(); |
413 | 411 | ||
414 | sband = local->hw.wiphy->bands[chan->band]; | 412 | pos = skb_put(skb, 2 + 1); |
415 | if (sband->band == IEEE80211_BAND_2GHZ) { | 413 | *pos++ = WLAN_EID_DS_PARAMS; |
416 | pos = skb_put(skb, 2 + 1); | 414 | *pos++ = 1; |
417 | *pos++ = WLAN_EID_DS_PARAMS; | 415 | *pos++ = ieee80211_frequency_to_channel(chan->center_freq); |
418 | *pos++ = 1; | ||
419 | *pos++ = ieee80211_frequency_to_channel(chan->center_freq); | ||
420 | } | ||
421 | 416 | ||
422 | return 0; | 417 | return 0; |
423 | } | 418 | } |