From 205dd2593c4e8a657e3804a08da247a2728a6e62 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 8 Apr 2013 11:06:12 -0700
Subject: [PATCH] --- yaml --- r: 369563 b: refs/heads/master c:
 9d6d6f4924133567a108a862d9cf949cd03f71cb h: refs/heads/master i:   369561:
 fddcc6fd186671fa17f7e120114a111992bb8e78   369559:
 6a757f4e8b857dcaa58f0f4856037030e8b1d5d3 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 939ef5635ccc..52edc6adf86c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ea927748ced4953f1e9a0f1fa1fdeacd1018b4e
+refs/heads/master: 9d6d6f4924133567a108a862d9cf949cd03f71cb
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 5b4492af4e85..5168f89c754d 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/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;