From patchwork Wed Oct 24 19:43:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 1640321 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BFC4B3FCF7 for ; Wed, 24 Oct 2012 19:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935512Ab2JXTon (ORCPT ); Wed, 24 Oct 2012 15:44:43 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:48279 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935311Ab2JXTnl (ORCPT ); Wed, 24 Oct 2012 15:43:41 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so592058pad.19 for ; Wed, 24 Oct 2012 12:43:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=XfikM0olfG3JbiKSMaeCqnIIYfVZ0Gq12anQbM54rGI=; b=BL28SydapxmTpCiWy8epQj+wk3Rdxr10LmQyLt6b3OiwSclXOIzpEt82mDT/17kGgB iQ3XaH0Q7SBCdGbLrt7ufLAufw1ckIrhIRroGORO7O863XEC2jLhs3GzSyosK0PtuwTR sUOF7HY4egCYIeEz0VbcRAAycWOfdDCD0XFKMIad1dQUyzHYEu3g4hV7AnL2GJztkjsW QlBjnO59AdQC0YUF3iBk57YHPkLOEms0+RBL94X1c7yktEir1nO/nPJN/zLYgnjPNpKV N5WHEOOU6FhUI+7a0+PvPhnxrGFTru1fLZJvF87+dFSGsS2McDgUPz39JtoS9ogSeog2 qF9Q== Received: by 10.68.247.39 with SMTP id yb7mr7403499pbc.15.1351107821011; Wed, 24 Oct 2012 12:43:41 -0700 (PDT) Received: from localhost.localdomain (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id qn1sm9883443pbc.55.2012.10.24.12.43.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 12:43:40 -0700 (PDT) From: Javier Cardona To: linville@tuxdriver.com Cc: Javier Cardona , linux-wireless@vger.kernel.org, devel@lists.open80211s.org, johannes@sipsolutions.net Subject: [PATCH 2/2] mac80211: Don't drop frames received with mesh ttl == 1 Date: Wed, 24 Oct 2012 12:43:31 -0700 Message-Id: <1351107811-6661-2-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1351107811-6661-1-git-send-email-javier@cozybit.com> References: <1351107811-6661-1-git-send-email-javier@cozybit.com> X-Gm-Message-State: ALoCoQmz+jVg00V4AU13VtnOSK88VCN39e5KSUe+t0dR2zwjI4BFZ4HAbDPMja39A5h8exX5lcV8 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Prior this fix, those frames were not received, nor forwarded. Fix this to receive and not forward. Signed-off-by: Javier Cardona --- net/mac80211/rx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 1222127..f73e0dd 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1944,7 +1944,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) if (!--mesh_hdr->ttl) { IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl); - return RX_DROP_MONITOR; + goto out; } if (!ifmsh->mshcfg.dot11MeshForwarding)