summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2012-10-24 12:43:31 -0700
committerJohannes Berg <johannes.berg@intel.com>2012-10-25 13:52:20 +0200
commit2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c (patch)
treee894fcd7bfb9dee8e1d242ecd79f082090510ce3 /net
parent555cb715be8ef98b8ec362b23dfc254d432a35b1 (diff)
downloadlinux-3.10-2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c.tar.gz
linux-3.10-2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c.tar.bz2
linux-3.10-2ac64cd17f9af6d6adaa921bd9846a3c9bb9235c.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1222127de9b..f73e0dda0d8 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)