From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 8 Apr 2013 18:06:12 +0000 (-0700)
Subject: mac80211: unset FC retry bit in mesh fwding path
X-Git-Tag: v3.12-rc1~804^2~21^2^2~80^2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d6d6f4924133567a108a862d9cf949cd03f71cb;p=kernel%2Fkernel-generic.git

mac80211: unset FC retry bit in mesh fwding path

Otherwise forwarded frames would keep the retry bit set
from the previous link transmission.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

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;