projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 555cb71)
mac80211: Don't drop frames received with mesh ttl == 1
authorJavier Cardona <javier@cozybit.com>
Wed, 24 Oct 2012 19:43:31 +0000 (12:43 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 25 Oct 2012 11:52:20 +0000 (13:52 +0200)
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>
net/mac80211/rx.c patch | blob | blame | history

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1222127de9befc516a3134acc80788a6f2c778ba..f73e0dda0d867ae0f426a7af3bb3b66c3d114b2a 100644 (file)
--- 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)