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

Javier Cardona · jmberg-intel · commit 2ac64cd17f9a · 2012-10-25T13:52:20.000+02:00
Prior this fix, those frames were not received, nor forwarded.  Fix
this to receive and not forward.

Signed-off-by: Javier Cardona &lt;javier@cozybit.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1944,7 +1944,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)`
`1944`	`1944`
`1945`	`1945`	`if (!--mesh_hdr->ttl) {`
`1946`	`1946`	`IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);`
`1947`		`- return RX_DROP_MONITOR;`
	`1947`	`+ goto out;`
`1948`	`1948`	`}`
`1949`	`1949`
`1950`	`1950`	`if (!ifmsh->mshcfg.dot11MeshForwarding)`