diff mbox

[v2] mac80211: Use rssi_threshold even though user_mpm=1

Message ID 1489730384-2799-1-git-send-email-masashi.honma@gmail.com (mailing list archive)
State Superseded
Delegated to: Johannes Berg
Headers show

Commit Message

Masashi Honma March 17, 2017, 5:59 a.m. UTC 
Previously the meshcfg.rssi_threshold did not work with user_mpm=1.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---
 net/mac80211/mesh.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Masashi Honma March 26, 2017, 8:53 p.m. UTC | #1 
On 2017/03/17 14:59, Masashi Honma wrote:
> Previously the meshcfg.rssi_threshold did not work with user_mpm=1.
>
> Signed-off-by: Masashi Honma <masashi.honma@gmail.com>

Is there any comment ?

Masashi Honma.
Johannes Berg March 29, 2017, 8:29 a.m. UTC | #2 
On Mon, 2017-03-27 at 05:53 +0900, Masashi Honma wrote:
> On 2017/03/17 14:59, Masashi Honma wrote:
> > Previously the meshcfg.rssi_threshold did not work with user_mpm=1.
> > 
> > Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
> 
> Is there any comment ?

I just applied the other patch "drop new node"

johannes
diff mbox

Patch

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 6e7b6a0..281d834 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -1100,8 +1100,14 @@  static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 	if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
 		return;
 
-	if (mesh_matches_local(sdata, &elems))
-		mesh_neighbour_update(sdata, mgmt->sa, &elems);
+	if (mesh_matches_local(sdata, &elems)) {
+		mpl_dbg(sdata, "rssi_threshold=%d,rx_status->signal=%d\n",
+			sdata->u.mesh.mshcfg.rssi_threshold, rx_status->signal);
+		if (!sdata->u.mesh.user_mpm ||
+		    sdata->u.mesh.mshcfg.rssi_threshold == 0 ||
+		    sdata->u.mesh.mshcfg.rssi_threshold < rx_status->signal)
+			mesh_neighbour_update(sdata, mgmt->sa, &elems);
+	}
 
 	if (ifmsh->sync_ops)
 		ifmsh->sync_ops->rx_bcn_presp(sdata,