From: Javier Cardona <javier@cozybit.com>
Date: Wed, 24 Oct 2012 19:43:31 +0000 (-0700)
Subject: mac80211: Don't drop frames received with mesh ttl == 1
X-Git-Tag: MMI-PSA29.97-13-9~15481^2~2^2~4^2~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac80211: Don't drop frames received with mesh ttl == 1

Prior this fix, those frames were not received, nor forwarded.  Fix
this to receive and not forward.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1222127de9be..f73e0dda0d86 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1944,7 +1944,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 
 	if (!--mesh_hdr->ttl) {
 		IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);
-		return RX_DROP_MONITOR;
+		goto out;
 	}
 
 	if (!ifmsh->mshcfg.dot11MeshForwarding)