From patchwork Mon Apr 8 18:06:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2410711 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 68D46DFB78 for ; Mon, 8 Apr 2013 18:07:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934912Ab3DHSHy (ORCPT ); Mon, 8 Apr 2013 14:07:54 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:52794 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762858Ab3DHSHx (ORCPT ); Mon, 8 Apr 2013 14:07:53 -0400 Received: by mail-pd0-f178.google.com with SMTP id w11so3340615pde.9 for ; Mon, 08 Apr 2013 11:07:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=JTwqs4lP/xH2J7bT99bCxGlEU4cwJPcLzQDPSmkvKvQ=; b=REpfuYvMnKJk2OU7O3SZ7oHDg2pptUTxC6VsXAmQ1fwEJM0jLT2nxo6oyFaFIXpeZG x2e5LVYskam9N3G7ZFAcmETRPQCjkXkOI5KLSDqiwen2wPnvzqkVGQVVcPZ8e/xqeclz D51b0DRIeEjecEUD58vAOCo2XbszPJBW+UIhVHBoQKDkZrMz2HsGdjJrgJrhZpD+CEfz yBL6hVpt1DqHWky3s01ChvbBPL/ptpVGcLfw73bDpiObLH9/p/smsKVgoOoC1SmfUSsH JfaC87xOxqQBrM/cwDXIttUjMVFMf9LfVUCuArYKLDWvwA2zp0Y03v4QDgUqbsohWK/s 7s2g== X-Received: by 10.66.196.68 with SMTP id ik4mr8234113pac.105.1365444471058; Mon, 08 Apr 2013 11:07:51 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id pa2sm40603095pac.9.2013.04.08.11.07.48 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 11:07:49 -0700 (PDT) From: Thomas Pedersen To: Johannes Berg Cc: linux-wirelss , open80211s , Thomas Pedersen Subject: [PATCH 1/6] mac80211: unset FC retry bit in mesh fwding path Date: Mon, 8 Apr 2013 11:06:12 -0700 Message-Id: <1365444377-9959-1-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQksbvdW3e3FkliBjcQvLHLgLjP05Ko8caHggEGn16y6kBD4hiIayj0lVsNez7gufZPYqAi9 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Otherwise forwarded frames would keep the retry bit set from the previous link transmission. Signed-off-by: Thomas Pedersen --- net/mac80211/rx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5b4492a..5168f89 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2085,6 +2085,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) } fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data; + fwd_hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_RETRY); info = IEEE80211_SKB_CB(fwd_skb); memset(info, 0, sizeof(*info)); info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;