summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-04-08 11:06:12 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-04-10 20:24:15 +0200
commit9d6d6f4924133567a108a862d9cf949cd03f71cb (patch)
tree40c97b5b83bb96c4a660b98112da6d10b0005f42 /net/mac80211
parent9ea927748ced4953f1e9a0f1fa1fdeacd1018b4e (diff)
downloadlinux-9d6d6f4924133567a108a862d9cf949cd03f71cb.tar.bz2
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5b4492af4e85..5168f89c754d 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;