diff options
| author | Chun-Yeow Yeoh <yeohchunyeow@cozybit.com> | 2013-08-22 10:28:58 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-08-23 15:25:06 +0200 |
| commit | a4ef66a915b957416a89a48365aea2ec2dc551f6 (patch) | |
| tree | 4de470b8f12b518b85a9b8dd3bca3103632c4c44 /net/mac80211 | |
| parent | 1fb9026000e66ffe032b11ec724c1bc7d068198e (diff) | |
mac80211: only respond to probe request with mesh ID
Previously, the mesh STA responds to probe request from legacy STA
but now it will only respond to legacy STA if the legacy STA does include
the specific mesh ID or wildcard mesh ID in the probe request.
The iw patch "iw: scan using meshid" can be used either by legacy STA
or by mesh STA to do active scanning by inserting the mesh ID in the
probe request frame.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com>
Acked-by: Thomas Pedersen <thomas@cozybit.com>
Acked-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 885a5f6e2c2..707ac61d63e 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -832,6 +832,9 @@ ieee80211_mesh_rx_probe_req(struct ieee80211_sub_if_data *sdata, ieee802_11_parse_elems(pos, len - baselen, false, &elems); + if (!elems.mesh_id) + return; + /* 802.11-2012 10.1.4.3.2 */ if ((!ether_addr_equal(mgmt->da, sdata->vif.addr) && !is_broadcast_ether_addr(mgmt->da)) || |