Return-path: Received: from mail-pb0-f50.google.com ([209.85.160.50]:59618 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753485Ab3HVRBi (ORCPT ); Thu, 22 Aug 2013 13:01:38 -0400 Received: by mail-pb0-f50.google.com with SMTP id uo5so2068742pbc.9 for ; Thu, 22 Aug 2013 10:01:38 -0700 (PDT) From: Chun-Yeow Yeoh To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, linville@tuxdriver.com, devel@lists.open80211s.org, distro11s@cozybit.com, Chun-Yeow Yeoh Subject: [PATCH v2] mac80211: only respond to probe request with mesh ID Date: Thu, 22 Aug 2013 10:01:32 -0700 Message-Id: <1377190892-5328-1-git-send-email-yeohchunyeow@gmail.com> (sfid-20130822_190141_886964_C16C492B) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Chun-Yeow Yeoh 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 Acked-by: Thomas Pedersen Acked-by: Javier Cardona --- v2: modify comments (Thomas) net/mac80211/mesh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 885a5f6..a660fb8 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)) || -- 1.7.9.5