summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJavier Cardona2011-04-08 00:08:29 +0200
committerJohn W. Linville2011-04-12 22:57:37 +0200
commit5cff5e01e818029a5d2c3c31b7ae5e5e7ee70452 (patch)
tree6031ce45cf4a1dd62d9f1237a225a0a8ce005cf0 /net/mac80211/mesh.c
parentcfg80211/nl80211: Add userspace authentication flag to mesh setup (diff)
downloadkernel-qcow2-linux-5cff5e01e818029a5d2c3c31b7ae5e5e7ee70452.tar.gz
kernel-qcow2-linux-5cff5e01e818029a5d2c3c31b7ae5e5e7ee70452.tar.xz
kernel-qcow2-linux-5cff5e01e818029a5d2c3c31b7ae5e5e7ee70452.zip
mac80211: ignore peers if security is enabled for this mesh
Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 1c244c0c7664..47a26c0f6993 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -573,6 +573,10 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
&elems);
+ /* ignore beacons from secure mesh peers if our security is off */
+ if (elems.rsn_len && !sdata->u.mesh.is_secure)
+ return;
+
if (elems.ds_params && elems.ds_params_len == 1)
freq = ieee80211_channel_to_frequency(elems.ds_params[0], band);
else