From patchwork Fri May 6 22:11:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 763382 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p46MC0wm020893 for ; Fri, 6 May 2011 22:12:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752211Ab1EFWL6 (ORCPT ); Fri, 6 May 2011 18:11:58 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:43736 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494Ab1EFWL5 (ORCPT ); Fri, 6 May 2011 18:11:57 -0400 Received: by pvg12 with SMTP id 12so1606275pvg.19 for ; Fri, 06 May 2011 15:11:57 -0700 (PDT) Received: by 10.143.21.9 with SMTP id y9mr2232228wfi.444.1304719917370; Fri, 06 May 2011 15:11:57 -0700 (PDT) Received: from localhost.localdomain (99-8-184-170.lightspeed.snfcca.sbcglobal.net [99.8.184.170]) by mx.google.com with ESMTPS id w11sm4661634wfh.6.2011.05.06.15.11.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 May 2011 15:11:56 -0700 (PDT) From: Javier Cardona To: "John W. Linville" Cc: Fabrice Deyber , Javier Cardona , Thomas Pedersen , devel@lists.open80211s.org, Johannes Berg , linux-wireless@vger.kernel.org, jlopex@gmail.com Subject: [PATCH] mac80211: Only process mesh PREPs with equal seq number if metric is better. Date: Fri, 6 May 2011 15:11:51 -0700 Message-Id: <1304719911-22636-1-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 06 May 2011 22:12:00 +0000 (UTC) From: Fabrice Deyber This fixes routing loops in PREP propagation and is in accordance with Draft 11, Section: 11C.9.8.4. Signed-off-by: Fabrice Deyber Signed-off-by: Javier Cardona --- net/mac80211/mesh_hwmp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index e57f2e7..849fecd 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -391,7 +391,6 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, (mpath->flags & MESH_PATH_SN_VALID)) { if (SN_GT(mpath->sn, orig_sn) || (mpath->sn == orig_sn && - action == MPATH_PREQ && new_metric >= mpath->metric)) { process = false; fresh_info = false;