diff options
| author | Emanuel Taube | 2013-02-06 14:17:17 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-02-11 18:44:54 +0100 |
| commit | 601513aa208f27ea87400a410d42c978421530ec (patch) | |
| tree | 81c2f38fbf7f5c45238fdb9b8efa3d3c1bcadc11 /net/mac80211/mesh.c | |
| parent | mac80211: fix mesh sta teardown (diff) | |
| download | kernel-qcow2-linux-601513aa208f27ea87400a410d42c978421530ec.tar.gz kernel-qcow2-linux-601513aa208f27ea87400a410d42c978421530ec.tar.xz kernel-qcow2-linux-601513aa208f27ea87400a410d42c978421530ec.zip | |
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/mac80211/mesh.c')
| -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) int mesh_add_ds_params_ie(struct sk_buff *skb, 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_channel *chan; u8 *pos; @@ -411,13 +409,10 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, chan = chanctx_conf->def.chan; rcu_read_unlock(); - 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(chan->center_freq); - } + pos = skb_put(skb, 2 + 1); + *pos++ = WLAN_EID_DS_PARAMS; + *pos++ = 1; + *pos++ = ieee80211_frequency_to_channel(chan->center_freq); return 0; } |