diff options
| author | John W. Linville | 2013-04-10 20:09:54 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-04-10 20:09:54 +0200 |
| commit | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (patch) | |
| tree | 144b686bf3fd6512a55987da2d911f739646ce02 /net/mac80211/mesh.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | mac80211: make ieee802_11_parse_elems an inline (diff) | |
| download | kernel-qcow2-linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.tar.gz kernel-qcow2-linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.tar.xz kernel-qcow2-linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 123a300cef57..fd1024ef393b 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -907,7 +907,7 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, (!elems.rsn && sdata->u.mesh.security != IEEE80211_MESH_SEC_NONE)) return; - if (elems.ds_params && elems.ds_params_len == 1) + if (elems.ds_params) freq = ieee80211_channel_to_frequency(elems.ds_params[0], band); else freq = rx_status->freq; |