diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-11-25 21:47:18 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-11-25 21:47:18 +0100 |
commit | d5aedd7e1b2f024ced0486aeb730bc56875e5ac9 (patch) | |
tree | 8ba9d15789748952e5e02d7a8a4a8cda0e16ccfd /net/mac80211/spectmgmt.c | |
parent | mwifiex: fix memory leak issue for ibss join (diff) | |
parent | mac80211: set hw initial idle state (diff) | |
download | linux-d5aedd7e1b2f024ced0486aeb730bc56875e5ac9.tar.xz linux-d5aedd7e1b2f024ced0486aeb730bc56875e5ac9.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/spectmgmt.c')
-rw-r--r-- | net/mac80211/spectmgmt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c index a40da20b32e0..6ab009070084 100644 --- a/net/mac80211/spectmgmt.c +++ b/net/mac80211/spectmgmt.c @@ -78,6 +78,8 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, if (elems->mesh_chansw_params_ie) { csa_ie->ttl = elems->mesh_chansw_params_ie->mesh_ttl; csa_ie->mode = elems->mesh_chansw_params_ie->mesh_flags; + csa_ie->pre_value = le16_to_cpu( + elems->mesh_chansw_params_ie->mesh_pre_value); } new_freq = ieee80211_channel_to_frequency(new_chan_no, new_band); |