---

yaml --- r: 369563 b: refs/heads/master c: 9d6d6f4 h: refs/heads/master i: 369561: fddcc6f 369559: 6a757f4 v: v3
git-mirror · Apr 10, 2013 · 205dd25 · 205dd25
1 parent 11ad03a
commit 205dd25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;